gentoo resync : 25.08.2018

19 files changed, 232 insertions, 419 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 18699b8c0bdd..c944b51741fc 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index a72befd1d5ec..2284116bda0d 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,5 @@
+AUX 3.24.3-CVE-2018-14424.patch 6513 BLAKE2B ac51cbf4412f53f8460037ca7a811c0f3b883afbd6fabbd248719594e8ec730aab4a9a9e8adece0c53d0dda99f900b0ad450b5d5cf7a74999abd6756983ee4e8 SHA512 7ab8875f15828d8601482953e7b7be96326ff23c0ec945ccbaa401370c622734388daeb6be1043fff8694498dbfe2d7fc74f90bf8c59170df67c78bdb731cd13
+AUX 3.24.3-display-object-lifetime-fix.patch 3235 BLAKE2B d92c20c97f4007121029c1c719c7598af8dbcd181098ec52f0b61f281796d1a9e3981f644cd2bd0ae80025f63faf169db44b91b3075c42566ca0a5dfbd7f9ae3 SHA512 57a585a93754adc2448a2a85a55c90f7f27c5da0689debc93236ac3c26c79cf295abea73bcec5fce3d7651b3998715d11e2b232a35f590e53b52a859bc666523
 AUX 49-keychain-r1 193 BLAKE2B e4653256b9a0a23be84286d25278d2addf464cc541d43f57a33ed0390b562d03acf7f9d8510ad1b09d4a3736d2bb2a323f5fcc473014b6f351abb5bee71a419b SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21
 AUX 50-ssh-agent-r1 255 BLAKE2B d197daa7db7da3fc667e5bd561d2edf46b484365130a2d72259c4a2f316ec3af957599cd2c755f7e517ff32ed59e068d1dbcd47da6961534668786403590ff20 SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba
 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd
@@ -5,5 +7,5 @@ AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e4
 AUX gdm-3.8.4-logo.patch 805 BLAKE2B 80c323529acfe9287009494060f3e4d588dcf415845d3502840674ac0108cdd721e9af71e2df7cf94bb69fb3526d76e96bd21f31ed002fce460b30fd2afa3a20 SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2
 DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.24.3.ebuild 5989 BLAKE2B 30e27e656a9bdf1018f19ad8c17a7bb630d1ab4ce902e411bea5b9eaa17ed870c9028eaa77717a5eab502a00bef98a28551467ab9b5dfca59892e6024eda8554 SHA512 66b4242cb343b289746c368de1d4a76868951d2ed5c422866c42a621d546e973902a7a4987cfee52a3b8abea9633acfe64ba08b49ada717c58871202a6ce1e70
+EBUILD gdm-3.24.3-r1.ebuild 5789 BLAKE2B d21c9bfcc1ee3fb9c72323c9197a7f1e10a2d384e69bbe0a6eb58d40d4d8d223269c15503efcdb8869b919843f8e5cc7280a098056f1e3ef44cd3bc7b21a3b87 SHA512 2bd2933dabc1493fce0b08371b11ddd09ba59f354ee60cab47dd8e329366703591f14e9e38c6c552c1f9b414b97439f1910ed96167fb6d1927f1afdb06065c58
 MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844
diff --git a/gnome-base/gdm/files/3.24.3-CVE-2018-14424.patch b/gnome-base/gdm/files/3.24.3-CVE-2018-14424.patch
new file mode 100644
index 000000000000..4edb0670958f
--- /dev/null
+++ b/gnome-base/gdm/files/3.24.3-CVE-2018-14424.patch
@@ -0,0 +1,163 @@
+From 6060db704a19b0db68f2e9e6a2d020c0c78b6bba Mon Sep 17 00:00:00 2001
+From: Chris Coulson <chris.coulson@canonical.com>
+Date: Thu, 19 Jul 2018 18:26:05 +0100
+Subject: [PATCH] display-store: Pass the display object rather than the id in
+ the removed signal
+
+By the time GdmDisplayStore emits the "display-removed" signal, the display
+is no longer in the store and gdm_display_store_lookup will not work in
+signal handlers.
+
+Change the "display-removed" parameter from the display id to the GdmDisplay
+object, so that signal handers can perform any cleanup they need to do
+
+CVE-2018-14424
+
+Closes: https://gitlab.gnome.org/GNOME/gdm/issues/401
+---
+ daemon/gdm-display-store.c         | 11 +++--------
+ daemon/gdm-display-store.h         |  2 +-
+ daemon/gdm-local-display-factory.c | 13 +++----------
+ daemon/gdm-manager.c               | 19 +++++++++----------
+ daemon/gdm-manager.h               |  3 ++-
+ 5 files changed, 18 insertions(+), 30 deletions(-)
+
+diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c
+index af76f519..fd24334e 100644
+--- a/daemon/gdm-display-store.c
++++ b/daemon/gdm-display-store.c
+@@ -76,15 +76,10 @@ stored_display_new (GdmDisplayStore *store,
+ static void
+ stored_display_free (StoredDisplay *stored_display)
+ {
+-        char *id;
+-
+-        gdm_display_get_id (stored_display->display, &id, NULL);
+-
+         g_signal_emit (G_OBJECT (stored_display->store),
+                        signals[DISPLAY_REMOVED],
+                        0,
+-                       id);
+-        g_free (id);
++                       stored_display->display);
+ 
+         g_debug ("GdmDisplayStore: Unreffing display: %p",
+                  stored_display->display);
+@@ -281,9 +276,9 @@ gdm_display_store_class_init (GdmDisplayStoreClass *klass)
+                               G_STRUCT_OFFSET (GdmDisplayStoreClass, display_removed),
+                               NULL,
+                               NULL,
+-                              g_cclosure_marshal_VOID__STRING,
++                              g_cclosure_marshal_VOID__OBJECT,
+                               G_TYPE_NONE,
+-                              1, G_TYPE_STRING);
++                              1, G_TYPE_OBJECT);
+ 
+         g_type_class_add_private (klass, sizeof (GdmDisplayStorePrivate));
+ }
+diff --git a/daemon/gdm-display-store.h b/daemon/gdm-display-store.h
+index 28359933..0aff8ee2 100644
+--- a/daemon/gdm-display-store.h
++++ b/daemon/gdm-display-store.h
+@@ -49,7 +49,7 @@ typedef struct
+         void          (* display_added)    (GdmDisplayStore *display_store,
+                                             const char      *id);
+         void          (* display_removed)  (GdmDisplayStore *display_store,
+-                                            const char      *id);
++                                            GdmDisplay      *display);
+ } GdmDisplayStoreClass;
+ 
+ typedef enum
+diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
+index b29f5ac5..403921d3 100644
+--- a/daemon/gdm-local-display-factory.c
++++ b/daemon/gdm-local-display-factory.c
+@@ -558,18 +558,11 @@ on_display_added (GdmDisplayStore        *display_store,
+ 
+ static void
+ on_display_removed (GdmDisplayStore        *display_store,
+-                    const char             *id,
++                    GdmDisplay             *display,
+                     GdmLocalDisplayFactory *factory)
+ {
+-        GdmDisplay *display;
+-
+-        display = gdm_display_store_lookup (display_store, id);
+-
+-        if (display != NULL) {
+-                g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory);
+-                g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory);
+-
+-        }
++        g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory);
++        g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory);
+ }
+ 
+ static gboolean
+diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
+index 7539acf1..1943d89e 100644
+--- a/daemon/gdm-manager.c
++++ b/daemon/gdm-manager.c
+@@ -1700,19 +1700,18 @@ on_display_status_changed (GdmDisplay *display,
+ 
+ static void
+ on_display_removed (GdmDisplayStore *display_store,
+-                    const char      *id,
++                    GdmDisplay      *display,
+                     GdmManager      *manager)
+ {
+-        GdmDisplay *display;
++        char    *id;
+ 
+-        display = gdm_display_store_lookup (display_store, id);
+-        if (display != NULL) {
+-                g_dbus_object_manager_server_unexport (manager->priv->object_manager, id);
++        gdm_display_get_id (display, &id, NULL);
++        g_dbus_object_manager_server_unexport (manager->priv->object_manager, id);
++        g_free (id);
+ 
+-                g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager);
++        g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager);
+ 
+-                g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, id);
+-        }
++        g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, display);
+ }
+ 
+ static void
+@@ -2694,9 +2693,9 @@ gdm_manager_class_init (GdmManagerClass *klass)
+                               G_STRUCT_OFFSET (GdmManagerClass, display_removed),
+                               NULL,
+                               NULL,
+-                              g_cclosure_marshal_VOID__STRING,
++                              g_cclosure_marshal_VOID__OBJECT,
+                               G_TYPE_NONE,
+-                              1, G_TYPE_STRING);
++                              1, G_TYPE_OBJECT);
+ 
+         g_object_class_install_property (object_class,
+                                          PROP_XDMCP_ENABLED,
+diff --git a/daemon/gdm-manager.h b/daemon/gdm-manager.h
+index 41c68a7a..c8fb3f22 100644
+--- a/daemon/gdm-manager.h
++++ b/daemon/gdm-manager.h
+@@ -24,6 +24,7 @@
+ 
+ #include <glib-object.h>
+ 
++#include "gdm-display.h"
+ #include "gdm-manager-glue.h"
+ 
+ G_BEGIN_DECLS
+@@ -50,7 +51,7 @@ typedef struct
+         void          (* display_added)    (GdmManager      *manager,
+                                             const char      *id);
+         void          (* display_removed)  (GdmManager      *manager,
+-                                            const char      *id);
++                                            GdmDisplay      *display);
+ } GdmManagerClass;
+ 
+ typedef enum
+-- 
+2.17.1
+
diff --git a/gnome-base/gdm/files/3.24.3-display-object-lifetime-fix.patch b/gnome-base/gdm/files/3.24.3-display-object-lifetime-fix.patch
new file mode 100644
index 000000000000..47366ed686cb
--- /dev/null
+++ b/gnome-base/gdm/files/3.24.3-display-object-lifetime-fix.patch
@@ -0,0 +1,61 @@
+From 765b306c364885dd89d47fe9fe8618ce6a467bc1 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 19 Jul 2018 16:01:23 -0400
+Subject: [PATCH] display: tie skeleton handlers to object lifetime
+
+Right now we assume a display skeleton object won't
+outlive its associated display object.
+
+In theory that should be true, but if we accidentally
+leak the skeleton it could erroneously happen.
+
+If that does happen then we'll end accessing free'd
+memory, so the leak will turn into a crasher.
+
+This commit addresses this problem by ensuring
+the skeleton signal handlers are disconnected when the
+associated display object goes away.
+
+CVE-2018-14424
+---
+ daemon/gdm-display.c | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
+index 1b58781d..5e193f2f 100644
+--- a/daemon/gdm-display.c
++++ b/daemon/gdm-display.c
+@@ -1109,18 +1109,18 @@ register_display (GdmDisplay *self)
+         self->priv->object_skeleton = g_dbus_object_skeleton_new (self->priv->id);
+         self->priv->display_skeleton = GDM_DBUS_DISPLAY (gdm_dbus_display_skeleton_new ());
+ 
+-        g_signal_connect (self->priv->display_skeleton, "handle-get-id",
+-                          G_CALLBACK (handle_get_id), self);
+-        g_signal_connect (self->priv->display_skeleton, "handle-get-remote-hostname",
+-                          G_CALLBACK (handle_get_remote_hostname), self);
+-        g_signal_connect (self->priv->display_skeleton, "handle-get-seat-id",
+-                          G_CALLBACK (handle_get_seat_id), self);
+-        g_signal_connect (self->priv->display_skeleton, "handle-get-x11-display-name",
+-                          G_CALLBACK (handle_get_x11_display_name), self);
+-        g_signal_connect (self->priv->display_skeleton, "handle-is-local",
+-                          G_CALLBACK (handle_is_local), self);
+-        g_signal_connect (self->priv->display_skeleton, "handle-is-initial",
+-                          G_CALLBACK (handle_is_initial), self);
++        g_signal_connect_object (self->priv->display_skeleton, "handle-get-id",
++                                 G_CALLBACK (handle_get_id), self, 0);
++        g_signal_connect_object (self->priv->display_skeleton, "handle-get-remote-hostname",
++                                 G_CALLBACK (handle_get_remote_hostname), self, 0);
++        g_signal_connect_object (self->priv->display_skeleton, "handle-get-seat-id",
++                                 G_CALLBACK (handle_get_seat_id), self, 0);
++        g_signal_connect_object (self->priv->display_skeleton, "handle-get-x11-display-name",
++                                 G_CALLBACK (handle_get_x11_display_name), self, 0);
++        g_signal_connect_object (self->priv->display_skeleton, "handle-is-local",
++                                 G_CALLBACK (handle_is_local), self, 0);
++        g_signal_connect_object (self->priv->display_skeleton, "handle-is-initial",
++                                 G_CALLBACK (handle_is_initial), self, 0);
+ 
+         g_dbus_object_skeleton_add_interface (self->priv->object_skeleton,
+                                               G_DBUS_INTERFACE_SKELETON (self->priv->display_skeleton));
+-- 
+2.17.1
+
diff --git a/gnome-base/gdm/gdm-3.24.3.ebuild b/gnome-base/gdm/gdm-3.24.3-r1.ebuild
index 6dc61fc310ac..b434e40bb942 100644
--- a/gnome-base/gdm/gdm-3.24.3.ebuild
+++ b/gnome-base/gdm/gdm-3.24.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator
+inherit eutils gnome2 pam readme.gentoo-r1 systemd user
 
 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
 HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
@@ -126,6 +126,10 @@ src_prepare() {
 	# Gentoo does not have a fingerprint-auth pam stack
 	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
 
+	# CVE-2018-14424, bug #662782
+	eapply "${FILESDIR}/${PV}-CVE-2018-14424.patch"
+	eapply "${FILESDIR}/${PV}-display-object-lifetime-fix.patch"
+
 	# Show logo when branding is enabled
 	use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch"
 
@@ -192,20 +196,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	local d ret
-
 	gnome2_pkg_postinst
-
-	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
-	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
-		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
 	systemd_reenable gdm.service
-
 	readme.gentoo_print_elog
 }
diff --git a/gnome-base/libgnomeprint/Manifest b/gnome-base/libgnomeprint/Manifest
deleted file mode 100644
index fc9da92e76a1..000000000000
--- a/gnome-base/libgnomeprint/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libgnomeprint-2.18.8-bison3.patch 861 BLAKE2B 44ae885666a4e66b43154690914667b21d7e99076e64ec223e6424fda76924c60f85873f61f6e40fbad7ddc405ae1dd5921f2596eec0864e5ec3bf7c73958021 SHA512 c13f2c5618bf28047e80155ed6d391930c5c986f4640d1e83aa3c323da7052bb2babf1772a37bc2782babd8ed072d18596d32792d4abf9440946dfd56e6cbfe8
-AUX libgnomeprint-2.18.8-cups-config.patch 1448 BLAKE2B 44477e228bd5aa5fce8be75e444c3a4cc2ed01cc0b62df5f16a11eea75a43e141fffc72c10dad806470b622f5f508ec5f638b70c265cb9bc47d9b4fca62ed288 SHA512 3290c71f0be264afe94428fb5c2f68287371a02e7497b657c9d3b9ef9bc358f82773d17da94fe67e585233236b9b5f2aed2d01ea5dc1c7e8f50696e00d80c89d
-AUX libgnomeprint-2.18.8-freetype-2.5.1.patch 3064 BLAKE2B 0b729d80486a43312f1558933cbce6dc06795eff52f4f1cae8602721a5d6d93050c8aa688faa27fef783565308aa815722cee704ee0b2ff72dbd93f3cf58ac0c SHA512 09a98494d3181df7356f6a19fcbd9ef23007d700baa0dc27373a5d03ae8983ce4bf21145384c75cc337676e8c58d5a4cdd43182ece4e6ec4fa6c447def355f1a
-AUX libgnomeprint-2.18.8-stdio-include.patch 271 BLAKE2B ddd56bebdcbd566d80514c7f9490ababb8b80f5fe052aaf3ca20c59a6c9b174dc1fd310ea3386e6f64bd14c80710f6857668eee6b38705ef8a5dc9a9892c2398 SHA512 3905f9d85606504666b8b4585a8360fc372504f2431049abf4518b8d8106c4c6e69f6cc401b48810d4252763f6adfcafe1303695350f91a17e2522f02898fce7
-DIST libgnomeprint-2.18.8.tar.bz2 880489 BLAKE2B e706e227c51b4be17246a86c59a29ec9129ea5dce7a073785debc29d04b2a13e71c731085088242bf4bc7946f7862f8d4c8c67b09afc05dc3e59d6809635a79d SHA512 eca4f118e918f8db04332c3c6df5370ee45497057b44747457b05f0517c55b38271b24cdf7493b8ba24875b2d53d99b5e64d5d63a04cd7fd895cb02ae1606469
-EBUILD libgnomeprint-2.18.8-r1.ebuild 2008 BLAKE2B 5b0e714c256dd2509a17780a9d0ad87bd8c5eb1c3029b76d3ef9b05e6988787d90f08249ffec6f7813a992a507633af8d8c0474d51fbf3c1aec93f36f9ed4544 SHA512 d8adfe9ed1d865756f3d0b5ed0536b9db1e82c8b304ba9be648f857ad45691249be3b2d7e4cd4fea088d634ad16fbaebc4e831fd8d3f7fcaeaa587f949b007fb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch
deleted file mode 100644
index d9fbbdd84fb9..000000000000
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch
-
---- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig	2010-02-09 13:32:51.000000000 +0100
-+++ libgnomeprint-2.18.8/libgnomeprint/grammar.y	2013-11-03 21:44:59.859877696 +0100
-@@ -6,8 +6,6 @@
- #include <libgnomeprint/types.h>
- #include <libgnomeprint/gnome-print-filter.h>
- 
--#define YYPARSE_PARAM graph
--
- static void
- set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s)
- {
-@@ -99,7 +97,7 @@
- }
- 
- static int yylex (void *lvalp);
--static int yyerror (const char *s);
-+static int yyerror (graph_t *g, const char *s);
- %}
- 
- %union {
-@@ -117,6 +115,7 @@
- %type <p> pool
- 
- %pure_parser
-+%parse-param { graph_t *graph }
- 
- %start graph
- %%
-@@ -185,7 +184,7 @@
- %%
- 
- static int
--yyerror (const char *s)
-+yyerror (graph_t *g, const char *s)
- {
- 	return -1;
- }
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
deleted file mode 100644
index 999c6f075203..000000000000
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ffbc68cc8518c7e7263a42d4284b749b40c5e871 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 29 Jun 2014 10:47:41 +0200
-Subject: [PATCH] Use AC_PATH_TOOL to find proper cups-config.
-
----
- configure.in | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 729278d..186fabf 100644
---- a/configure.in
-+++ b/configure.in
-@@ -223,17 +223,18 @@ AC_ARG_WITH(cups,
- )
- if test "x$try_cups" = "xyes"; then
- 	PKG_CHECK_MODULES(CUPS, "gmodule-2.0")
-+	AC_PATH_TOOL(CUPS_CONFIG, cups-config)
- 	AC_MSG_CHECKING(for CUPS libraries version >= 1.1.20)
--	if cups-config --version --libs > /dev/null 2>&1; then
--	    verstxt=`cups-config --version`
-+	if $CUPS_CONFIG --version --libs > /dev/null 2>&1; then
-+	    verstxt=`$CUPS_CONFIG --version`
- 	    vers=`echo "$verstxt" | \
- 		awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- 	    if test "$vers" -lt 1001020; then
- 		    AC_MSG_RESULT(Cups found but the version found is less than 1.1.20)
-               cups_msg="Version requirement not satisfied"
- 	    else
--		    CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`"
--		    CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`"
-+		    CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --libs`"
-+		    CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`"
- 		    AC_MSG_RESULT(Found version $verstxt)
- 	    fi
- 
--- 
-2.0.0
-
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
deleted file mode 100644
index 1a54e9be5b67..000000000000
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From e848ee98108ab8c5b12e2167b041b274b4bede83 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 8 Oct 2015 11:06:44 +0200
-Subject: [PATCH] Update freetype includes to work with >=freetype-2.5.1
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.in                    | 22 +++-------------------
- libgnomeprint/gnome-font-face.c |  3 ++-
- libgnomeprint/gnome-print-gdi.c |  2 +-
- libgnomeprint/gnome-rfont.c     |  4 ++--
- 4 files changed, 8 insertions(+), 23 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index c15bb69..aebe591 100644
---- a/configure.in
-+++ b/configure.in
-@@ -162,25 +162,9 @@ LDFLAGS="$LDFLAGS $LIBM"
- dnl =================================
- dnl Checking for freetype2
- dnl =================================
--FREETYPE_LIBS=
--FREETYPE_CFLAGS=
--AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
--if test "x$FREETYPE_CONFIG" = "xno" ; then
--	AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
--else
--	FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
--	FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
--fi
--
--libgnomeprint_save_ldflags=$LDFLAGS
--LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
--
--freetype_version=false
--AC_MSG_NOTICE([checking for sufficiently new FreeType (at least 2.0.5)])
--AC_CHECK_LIB(freetype, FT_Get_Postscript_Name,:,[
--    AC_MSG_ERROR(You need FreeType2 (freetype-devel 2.0.5 or greater package) for this version of libgnomeprint)])
--
--LDFLAGS=$libgnomeprint_save_ldflags
-+dnl "freetype2 >= 17" means freetype-2.5.1
-+PKG_CHECK_MODULES(FREETYPE, freetype2 >= 17, ,
-+	[PKG_CHECK_MODULES(FREETYPE, freetype2, [FREETYPE_CFLAGS="$FREETYPE_CFLAGS -I`$PKG_CONFIG --variable=includedir freetype2`/freetype2/freetype"])])
- 
- dnl =================================
- dnl END: Checking for freetype2
-diff --git a/libgnomeprint/gnome-font-face.c b/libgnomeprint/gnome-font-face.c
-index 0447377..23794a8 100644
---- a/libgnomeprint/gnome-font-face.c
-+++ b/libgnomeprint/gnome-font-face.c
-@@ -36,7 +36,8 @@
- #include <stdarg.h>
- #include <locale.h>
- 
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
- 
- #include <libgnomeprint/gnome-print-private.h>
- #include <libgnomeprint/gnome-font-private.h>
-diff --git a/libgnomeprint/gnome-print-gdi.c b/libgnomeprint/gnome-print-gdi.c
-index f89a8e8..7755673 100755
---- a/libgnomeprint/gnome-print-gdi.c
-+++ b/libgnomeprint/gnome-print-gdi.c
-@@ -36,7 +36,7 @@
- #include <libgnomeprint/gp-gc-private.h>
- 
- #include <ft2build.h>
--#include <freetype/freetype.h>
-+#include FT_FREETYPE_H
- 
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-diff --git a/libgnomeprint/gnome-rfont.c b/libgnomeprint/gnome-rfont.c
-index 55ec261..a71bbda 100644
---- a/libgnomeprint/gnome-rfont.c
-+++ b/libgnomeprint/gnome-rfont.c
-@@ -28,8 +28,8 @@
- 
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include <freetype/ftglyph.h>
--#include <freetype/ftbbox.h>
-+#include FT_GLYPH_H
-+#include FT_BBOX_H
- #include <libart_lgpl/art_misc.h>
- #include <libart_lgpl/art_affine.h>
- #include <libart_lgpl/art_vpath.h>
--- 
-2.6.1
-
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch
deleted file mode 100644
index dd9195434e87..000000000000
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c
-+++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
-@@ -34,6 +34,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <stdio.h>
- #include <unistd.h>
- #include <locale.h>
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild
deleted file mode 100644
index 599e35a3daac..000000000000
--- a/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2 multilib-minimal
-
-DESCRIPTION="Printer handling for Gnome"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cups doc"
-
-RDEPEND=">=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
-	>=media-libs/libart_lgpl-2.3.21-r2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cups? (
-		>=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}]
-		>=net-print/libgnomecups-0.2.3-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	sys-devel/flex
-	sys-devel/bison
-	doc? (
-		~app-text/docbook-xml-dtd-4.1.2
-		>=dev-util/gtk-doc-0.9 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stdio-include.patch \
-		"${FILESDIR}"/${P}-freetype-2.5.1.patch \
-		"${FILESDIR}"/${P}-bison3.patch \
-		"${FILESDIR}"/${P}-cups-config.patch
-	eautoreconf
-	gnome2_src_prepare
-
-	# Drop DEPRECATED flags, bug #384807
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' \
-		configure.in configure || die
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		libgnomeprint/ttsubset/Makefile.am \
-		libgnomeprint/ttsubset/Makefile.in || die
-}
-
-multilib_src_configure() {
-	# Disable papi support until papi is in portage; avoids automagic
-	# dependencies on an untracked library.
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_with cups) \
-		--without-papi \
-		--disable-static
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS BUGS ChangeLog* NEWS README"
-	einstalldocs
-}
diff --git a/gnome-base/libgnomeprint/metadata.xml b/gnome-base/libgnomeprint/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnomeprint/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgnomeprintui/Manifest b/gnome-base/libgnomeprintui/Manifest
deleted file mode 100644
index 64f42cabd4be..000000000000
--- a/gnome-base/libgnomeprintui/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libgnomeprintui-2.18.6-adwaita-icon-theme.patch 432 BLAKE2B aa074c916814318b030fdfd2a3280d4d8a2651fb8849612b719ea56832688d8d5e31fa363dfbe426687c6b0ec6168488375a491617d26dd34aabff6fe1e9d460 SHA512 99af09eb081b419d126ac0bc664da16cfae67fede67190f67f48642efa1624cb49690601514ff77978c9577b76d9c9e79b775f96eab0961e890871be2a88681a
-AUX libgnomeprintui-2.18.6-intl.patch 375 BLAKE2B 3b7e6940ff666cb6c2bd0ba38242c5ed3d0d12020c649f1ac8500a7c70d691d217797eb2df04838272468730e173e16be648f8120950f7dae8cdeea112e14847 SHA512 78f37aa03642d78eef38923b9b487748c275571ddba090ce96c52797f7166f8930f937c3b579fcd83255d9fa703c6fb5f718d734cfb9e2af289059ee482035ee
-AUX libgnomeprintui-2.18.6-orientation-for-preview.patch 1660 BLAKE2B b86a794c8e5942de0469cd2f6de5c2b873df3fe321f25bc8e8923d9644f8a4ac7bcc36bfbb0c29b5a2a4c2e7cb3aa3b0b0c05db6a5094c6712bcf7385a12b815 SHA512 aac905ee6e66367a36a2f2d1d256e3a97f1071fbd445e5d759a42ede3f0f59c3e80b4108b948de3b44ab24a0c2ae8cc32dbc72dbbbb3bde6c94d725741faa6b6
-AUX libgnomeprintui-2.18.6-system-config-printer.patch 710 BLAKE2B 342dc6936553a6fa2c51e119056058275255bf720b6fa5bb0dd551ae5f2d4821ddfb048416b0ad61b481a4b59e9468bbf3b7cd348a7304a90e323530577c1628 SHA512 35323ad7e829ce5dc0f607637e16cfeb5d88fe63685801887b2c295b5f81640722d9f25c1e85c9a346c6dd2c38bde5bcc9cb97c529a154dfd5d52a6b66452c70
-DIST libgnomeprintui-2.18.6.tar.bz2 681125 BLAKE2B 2850749f0d41cada9ecc377ff1fad17d1d629094f423f012069790c5b5ec56c047668a8e2d703a11e8654046b1c8e06c075fb350e2d25e05a06622c3a2072efc SHA512 acf44fd8b273f5e48c9c7224647704c1d45a66c8fb7279414028506fd6b8941126636499793c825a767f2f731fcddce78ce750670969d5ff9236e9ff75dca002
-EBUILD libgnomeprintui-2.18.6-r2.ebuild 1143 BLAKE2B 840c6958808eafe15e0de13eb5ef103020003625e5285dc8920b2118b1a5596b79968570e584a54f75a58a2fc799469e8ff61e09cd36e83d8cd47c9f5bbca4f1 SHA512 6a4e8afc4cba31086cce62d2602b3fde587e808035b5fa99c73420750e8dbd4f1f24c8401310f8f6c9705c0cf0e5cd0fbf1d3d94f56c4e4cb3b91aba069928eb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
deleted file mode 100644
index f1fc4541db65..000000000000
--- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./configure.in.orig ./configure.in
---- ./configure.in.orig	2014-05-04 11:07:55.308844477 +0300
-+++ ./configure.in	2014-05-04 11:08:26.884571685 +0300
-@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [
- 	gtk+-2.0	   >= 2.6.0
- 	libgnomeprint-2.2  >= 2.12.1
- 	libgnomecanvas-2.0 >= 1.117.0
--	gnome-icon-theme   >= 1.1.92
-+	adwaita-icon-theme >= 1.1.92
- ])
- AC_SUBST(LIBGNOMEPRINTUI_CFLAGS)
- AC_SUBST(LIBGNOMEPRINTUI_LIBS)
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch
deleted file mode 100644
index db206e6b13e8..000000000000
--- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am~	2010-02-09 12:33:13.000000000 +0000
-+++ libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am	2015-11-03 23:16:49.625137517 +0000
-@@ -2,7 +2,6 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir) \
--	-I$(top_srcdir)/intl \
- 	-I$(top_srcdir)/libgnomeprintui \
- 	-DWE_ARE_LIBGNOMEPRINT_INTERNALS \
- 	$(LIBGNOMEPRINTUI_CFLAGS)	\
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch
deleted file mode 100644
index 3a6aa63fe356..000000000000
--- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- ./libgnomeprintui/gnome-print-job-preview.c.orig	2012-02-23 22:48:42.000000000 +0600
-+++ ./libgnomeprintui/gnome-print-job-preview.c	2012-02-25 00:18:43.000000000 +0600
-@@ -152,6 +152,7 @@ 
- 	GtkWidget *last;
- 	GnomeCanvas *canvas;
- 	GnomePrintConfig *config;
-+    guchar *paper_orientation_save;
- 
- 	guint current_page, current_offset;
- 
-@@ -2187,6 +2188,19 @@ 
- 	if (jp->config)
- 		g_object_unref (G_OBJECT (jp->config));
- 	jp->config = config;
-+    if( config ) {
-+        guchar *txt = gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
-+        if( ( g_ascii_strcasecmp(( const gchar* )txt, "R90") == 0 ) ||
-+            ( g_ascii_strcasecmp(( const gchar* )txt, "R270") == 0 ) ) {
-+            jp->paper_orientation_save =
-+                gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION );
-+            gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, txt );
-+            g_free ( txt );
-+        }
-+        else {
-+            jp->paper_orientation_save = NULL;
-+        }
-+    }
- 	if (!jp->config)
- 		return;
- 	g_object_ref (G_OBJECT (jp->config));
-@@ -2389,6 +2403,13 @@ 
- {
- 	GnomePrintJobPreview *jp = GNOME_PRINT_JOB_PREVIEW (object);
- 
-+    if( jp->paper_orientation_save ) {
-+        gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION,
-+                                jp->paper_orientation_save );
-+        g_free ( jp->paper_orientation_save );
-+        jp->paper_orientation_save = NULL;
-+    }
-+
- 	gnome_print_job_preview_set_config (jp, NULL);
- 	gnome_print_job_preview_set_job (jp, NULL);
- 
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch
deleted file mode 100644
index 57e188c863b7..000000000000
--- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -p -up libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c
---- libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer	2008-09-23 10:49:59.000000000 +0200
-+++ libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c	2008-09-23 10:50:47.000000000 +0200
-@@ -47,7 +47,7 @@
- #include "gpaui/gpa-transport-selector.h"
- 
- #define GPS_PAD 4
--#define ADD_PRINTER_APP	"gnome-cups-add"
-+#define ADD_PRINTER_APP	"system-config-printer"
- 
- static void gnome_printer_selector_class_init (GnomePrinterSelectorClass *klass);
- static void gnome_printer_selector_init (GObject *object);
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
deleted file mode 100644
index ab335f9a1373..000000000000
--- a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools gnome2 multilib-minimal
-
-DESCRIPTION="User interface libraries for gnome print"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/libgnomeprint-2.12.1[${MULTILIB_USEDEP}]
-	>=gnome-base/libgnomecanvas-1.117[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.6:2[${MULTILIB_USEDEP}]
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	# Patches from Mageia
-	eapply "${FILESDIR}"/${P}-adwaita-icon-theme.patch
-	eapply "${FILESDIR}"/${P}-intl.patch
-	eapply "${FILESDIR}"/${P}-orientation-for-preview.patch
-	eapply "${FILESDIR}"/${P}-system-config-printer.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/gnome-base/libgnomeprintui/metadata.xml b/gnome-base/libgnomeprintui/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnomeprintui/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>