6 files changed, 18 insertions, 26 deletions
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e593ab175904..845074e5c2ea 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/glade-3.20.2 b/metadata/md5-cache/dev-util/glade-3.20.2
new file mode 100644
index 000000000000..dc51e688a409
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glade-3.20.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+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.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A user interface designer for GTK+ and GNOME
+EAPI=6
+HOMEPAGE=https://glade.gnome.org/
+IUSE=debug +introspection python python_targets_python2_7 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+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.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=3.10/6
+SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4da4c1666f63a73a203202282e9796ff
diff --git a/metadata/md5-cache/dev-util/tmake-2.12 b/metadata/md5-cache/dev-util/tmake-2.12
deleted file mode 100644
index 46633d833fb3..000000000000
--- a/metadata/md5-cache/dev-util/tmake-2.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A Cross platform Makefile tool
-EAPI=3
-HOMEPAGE=http://tmake.sourceforge.net
-KEYWORDS=~amd64 ppc x86 ~x86-linux ~ppc-macos
-LICENSE=HPND
-RDEPEND=>=dev-lang/perl-5
-SLOT=0
-SRC_URI=mirror://sourceforge/tmake/tmake-2.12.tar.bz2
-_md5_=86991d7afe845f44fab22b33a8bc3e0c
diff --git a/metadata/md5-cache/dev-util/tmake-2.12-r1 b/metadata/md5-cache/dev-util/tmake-2.12-r1
index ddc577c71873..49113908b79e 100644
--- a/metadata/md5-cache/dev-util/tmake-2.12-r1
+++ b/metadata/md5-cache/dev-util/tmake-2.12-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=A Cross platform Makefile tool
 EAPI=6
 HOMEPAGE=http://tmake.sourceforge.net
-KEYWORDS=amd64 ~ppc x86 ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~x86-linux ~ppc-macos
 LICENSE=HPND
 RDEPEND=>=dev-lang/perl-5
 SLOT=0
 SRC_URI=mirror://sourceforge/tmake/tmake-2.12.tar.bz2
-_md5_=598b6b9db93e62707a5f96e5672ca44e
+_md5_=57d54c5820459193f42ea2be7668b958
diff --git a/metadata/md5-cache/dev-util/valkyrie-2.0.0 b/metadata/md5-cache/dev-util/valkyrie-2.0.0
deleted file mode 100644
index fc77851c1ec2..000000000000
--- a/metadata/md5-cache/dev-util/valkyrie-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
-DESCRIPTION=Graphical front-end to the Valgrind suite of tools
-EAPI=3
-HOMEPAGE=http://www.valgrind.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
-SLOT=0
-SRC_URI=http://www.valgrind.org/downloads/valkyrie-2.0.0.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=751dfb339810d26879eb3777fd2faacf
diff --git a/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1 b/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1
index 532b34ea4347..f9a3860a340d 100644
--- a/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1
+++ b/metadata/md5-cache/dev-util/valkyrie-2.0.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
 DESCRIPTION=Graphical front-end to the Valgrind suite of tools
 EAPI=5
 HOMEPAGE=http://www.valgrind.org/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/valgrind-3.6.0 dev-qt/qtgui:4 dev-qt/qtcore:4
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valkyrie-2.0.0.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a45ea6bbd32cbf96150b01434cfce48e
+_md5_=db81bc33a002adf18f798b6b88e7a98e