2016-06-25 19:02:35 UTC

20 files changed, 116 insertions, 153 deletions

diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.16.0 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.16.0
deleted file mode 100644
index 338e32ffc2ea..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2 ) app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib dev-libs/libxslt >=dev-util/intltool-0.35 virtual/pkgconfig 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=Color profile manager for the GNOME desktop
-EAPI=5
-HOMEPAGE=https://git.gnome.org/browse/gnome-color-manager
-IUSE=packagekit raw test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-color-manager/3.16/gnome-color-manager-3.16.0.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9fffd1d72714a50161f50f46f2b3736f
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.16.2 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.16.2
deleted file mode 100644
index db0ca8e447a0..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libnotify:= >=x11-libs/gtk+-3.12:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= ) || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] ) >=dev-libs/gobject-introspection-0.9.6 dev-libs/folks[vala(+)] gnome-base/gnome-desktop[introspection] gnome-extra/evolution-data-server[vala] net-libs/telepathy-glib[vala] x11-libs/libnotify[introspection] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME contact management application
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
-IUSE=v4l
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libnotify:= >=x11-libs/gtk+-3.12:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-contacts/3.16/gnome-contacts-3.16.2.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	vala	7541b78609c301de4ea866a8cc1b53a6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=57564ed3723c01f15813f8f262781f0a
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.20.0
new file mode 100644
index 000000000000..d3506f0752f4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts:= >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.20.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= ) || ( dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] ) >=dev-libs/gobject-introspection-0.9.6:= dev-libs/folks[vala(+)] gnome-base/gnome-desktop:3=[introspection] gnome-extra/evolution-data-server[vala] net-libs/telepathy-glib[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME contact management application
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
+IUSE=v4l
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts:= >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.20.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-contacts/3.20/gnome-contacts-3.20.0.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	vala	7541b78609c301de4ea866a8cc1b53a6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=76da9aa83efbedb33ed84147f4d4207f
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.18.2-r1 b/metadata/md5-cache/gnome-extra/gnome-documents-3.18.2-r1
deleted file mode 100644
index ee96d7da8352..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.18.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-misc/tracker-1:= >=app-text/evince-3.13.3[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-2.6:4 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.15.5:3[introspection] x11-libs/pango[introspection] dev-libs/libxslt >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A document manager application for GNOME
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Documents
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-misc/tracker-1:= >=app-text/evince-3.13.3[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-2.6:4 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.15.5:3[introspection] x11-libs/pango[introspection] media-libs/clutter[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/gnome-icon-theme-symbolic
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-documents/3.18/gnome-documents-3.18.2.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:- src_configure:gnome2 src_compile:gnome2 src_install:gnome2
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4907bb8c1cff8e91b562d38ff4b370d9
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-documents-3.20.0
new file mode 100644
index 000000000000..36c113cd7f14
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.20.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-misc/tracker-1:=[miner-fs] >=app-text/evince-3.13.3[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-2.6:4 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.19.1:3[introspection] x11-libs/pango[introspection] dev-libs/libxslt >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A document manager application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Documents
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-misc/tracker-1:=[miner-fs] >=app-text/evince-3.13.3[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-2.6:4 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.19.1:3[introspection] x11-libs/pango[introspection] media-libs/clutter[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-documents/3.20/gnome-documents-3.20.0.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=cbfe7b10c025cb0234f7b7513f7a5bc4
diff --git a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.16.2 b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.20.0
index 8e8549c72a24..7df060a8998c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.16.2
+++ b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.20.0
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=app-text/yelp-tools dev-util/itstool sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Help a new user get started in GNOME
-EAPI=5
+EAPI=6
 HOMEPAGE=https://help.gnome.org/
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=gnome-extra/gnome-user-docs
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.16/gnome-getting-started-docs-3.16.2.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
+SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.20/gnome-getting-started-docs-3.20.0.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:gnome2 src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4212c08efb9ac0855a3ba90fbd85383c
+_md5_=6a6feb77ab8c61f67717579d18a7fdb2
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.16.2 b/metadata/md5-cache/gnome-extra/gnome-logs-3.16.2
deleted file mode 100644
index 89a7478a7322..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.16.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.43.90:2 sys-apps/systemd >=x11-libs/gtk+-3.15.7:3 ~app-text/docbook-xml-dtd-4.3 dev-libs/appstream-glib dev-libs/libxslt >=dev-util/intltool-0.50 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Log messages and event viewer
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Logs
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.43.90:2 sys-apps/systemd >=x11-libs/gtk+-3.15.7:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-logs/3.16/gnome-logs-3.16.2.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=82def3acacc975ec660c16cec0d6ca14
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.20.1 b/metadata/md5-cache/gnome-extra/gnome-logs-3.20.1
new file mode 100644
index 000000000000..6b2025271556
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-3.20.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.43.90:2 sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3 ~app-text/docbook-xml-dtd-4.3 dev-libs/appstream-glib dev-libs/libxslt >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig test? ( dev-util/dogtail ) 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=Log messages and event viewer
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Logs
+IUSE=test test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.43.90:2 sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-logs/3.20/gnome-logs-3.20.1.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 pkg_setup:- src_prepare:gnome2 src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=81ef2aa417d1b9bae6e2a3e1df4562a9
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.20.0
new file mode 100644
index 000000000000..1d4b00a1bffc
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.8 >=app-admin/packagekit-gtk-0.7.2 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= ) app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 dev-libs/libxslt sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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=PackageKit client for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
+IUSE=systemd test udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.8 >=app-admin/packagekit-gtk-0.7.2 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-packagekit/3.20/gnome-packagekit-3.20.0.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a44c82f871a7a98a36010b4272e35fdc
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.16.1 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.16.1
deleted file mode 100644
index 10b46c18488b..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext x11-proto/randrproto virtual/pkgconfig test? ( sys-apps/dbus ) 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=GNOME power management service
-EAPI=5
-HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
-IUSE=test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/gnome-icon-theme-symbolic
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-power-manager/3.16/gnome-power-manager-3.16.1.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=33a93c819ffd887725d682253663ed17
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.20.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.20.0
new file mode 100644
index 000000000000..4e6e814ea22e
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext x11-proto/randrproto virtual/pkgconfig test? ( sys-apps/dbus ) 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=GNOME power management service
+EAPI=6
+HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
+IUSE=test test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-power-manager/3.20/gnome-power-manager-3.20.0.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_test:- src_install:gnome2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=f9033633ce1bec5d13944990dcb37dd5
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.16.2 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.16.2
deleted file mode 100644
index 56d8546178e0..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=JavaScript extensions for GNOME Shell
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/gnome-icon-theme-symbolic
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.16/gnome-shell-extensions-3.16.2.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:-
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dc43c8c8d318d7d6ecadd578b735269b
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.18.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.20.1
index a4dafc56430d..95fb974c8196 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.18.3
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.20.1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=JavaScript extensions for GNOME Shell
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
 IUSE=examples
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.18/gnome-shell-extensions-3.18.3.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:-
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=969f3639ca1c7c3959cfe1de77203558
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.20/gnome-shell-extensions-3.20.1.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:- src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:-
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=573f08c89f774b4cf5c7ee47f8376a53
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-26 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-26
deleted file mode 100644
index c28ed7b6bfb6..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-26
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Shows legacy tray icons on top
-EAPI=5
-HOMEPAGE=https://extensions.gnome.org/extension/495/topicons/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.10
-SLOT=0
-SRC_URI=http://94.247.144.115/repo/topicons/snapshot/topicons-26.tar.xz
-_eclass_exported_funcs=pkg_postinst:- src_install:-
-_md5_=c0d4d6c102f2a6c82855da69806ea805
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-28-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-28-r1
new file mode 100644
index 000000000000..435b0c161470
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-28-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Shows legacy tray icons on top
+EAPI=6
+HOMEPAGE=https://extensions.gnome.org/extension/495/topicons/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.10
+SLOT=0
+SRC_URI=http://94.247.144.115/repo/topicons/snapshot/topicons-28.tar.xz -> gnome-shell-extensions-topicons-28.tar.xz
+_eclass_exported_funcs=pkg_postinst:- src_unpack:vcs-snapshot src_prepare:- src_install:-
+_eclasses_=vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
+_md5_=f6bfca25eefc51f78b317043f62c0cf0
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-0.10.3 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-0.10.3
deleted file mode 100644
index abf23b817c60..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-0.10.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Unofficial extension pack providing GNOME 2-like features for GNOME 3
-EAPI=5
-HOMEPAGE=http://frippery.org/extensions/index.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.16 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
-SLOT=0
-SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-0.10.3.tgz
-_eclass_exported_funcs=pkg_postinst:- src_install:-
-_md5_=424e26c61cb5c8e167820ad0f72f5102
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.18.1 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.20.0
index 06f9601a3f6e..87929c70bf07 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.20.0
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Unofficial extension pack providing GNOME 2-like features for GNOME 3
-EAPI=5
+EAPI=6
 HOMEPAGE=http://frippery.org/extensions/index.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.18 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.20 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
 SLOT=0
-SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-3.18.1.tgz
+SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-3.20.0.tgz
 _eclass_exported_funcs=pkg_postinst:- src_install:-
-_md5_=c2ece3092fffeb6c651a96834ce6b286
+_md5_=fd2d59fd3621710089205e939f3a8e39
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.16.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.20.1
index 0c5cb922b51f..2054797a99e6 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.16.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.20.1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.12:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-38:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 ) >=app-text/gnome-doc-utils-0.20 >=dev-util/intltool-0.41.0 virtual/pkgconfig systemd? ( !=sys-apps/systemd-43* ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.12:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 ) >=app-text/gnome-doc-utils-0.20 >=dev-util/intltool-0.41.0 dev-util/itstool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The Gnome System Monitor
-EAPI=5
+EAPI=6
 HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/
-IUSE=systemd +X
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+IUSE=systemd X
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.12:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-38:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
+RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.12:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.16/gnome-system-monitor-3.16.0.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
+SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.20/gnome-system-monitor-3.20.1.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:gnome2 src_configure:- src_compile:gnome2 src_install:gnome2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8822308e367f7f356133842eca406068
+_md5_=49d8c7186e2ef7f4b8ef99cb0c3e5960
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.18.1-r1 b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1
index 5ab7df6e60c2..e9889f643882 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.18.1-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.20.1
@@ -1,15 +1,15 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=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_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.4 >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-util/intltool-0.40.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=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_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.4 >=dev-util/intltool-0.40.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Tool to customize GNOME 3 options
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=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_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.4 >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup[introspection] net-libs/libsoup-gnome[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 gnome-base/gnome-shell >=gnome-base/nautilus-3
+RDEPEND=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_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.4 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 gnome-base/gnome-shell >=gnome-base/nautilus-3
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.18/gnome-tweak-tool-3.18.1.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
+SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.20/gnome-tweak-tool-3.20.1.tar.xz
+_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=881256108391c2035ffbcbac41a01d7c
+_md5_=123222cb4265d3de0b9ed05806ab374d
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.16.1 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.16.1
deleted file mode 100644
index a1375b4c4cb3..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=test? ( dev-libs/libxml2 ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME end user documentation
-EAPI=5
-HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=CC-BY-3.0
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-user-docs/3.16/gnome-user-docs-3.16.1.tar.xz
-_eclass_exported_funcs=pkg_preinst:gnome2 pkg_postrm:gnome2 pkg_postinst:gnome2 src_unpack:gnome2 src_prepare:gnome2 src_configure:- src_compile:- src_install:gnome2
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=53512d2d9720ea8c0466f9fdd95cf45f