gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /x11-libs
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
72 files changed, 231 insertions, 2243 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6719dcfc1276..5c0db94d09c0 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index e80bab31c112..f602dafe3602 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -4,5 +4,5 @@ DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 EBUILD gdk-pixbuf-2.36.11.ebuild 3891 BLAKE2B 04adc6a0d4efe34b9402d3d7464eb03f5082f8cd2aa942b4e8f33476de40bd4455d664768f957f74b28f84e6407fa763db0ee5bda2aac44320d174693cbd62a4 SHA512 037a2b68b2d072603cf751008388dba3011c5ebb5e529a99a71d78746ca354b94445097a047eef5a7d1698662068f26f2c46865d458f695d340e5db2ca4c8dba
-EBUILD gdk-pixbuf-2.36.12.ebuild 4078 BLAKE2B 6bf393a944b47eb42148ffaa01ccf7c37c26e1a71cad50172c72760a8704c1962dcd06bb9a7495045cf1a154babbf6e3827d789c254d8ef9a197525b7931f79c SHA512 3e8bd86c56377db4f648a30000db9f13b56b1a5b0d26bf43427ca7f026cfb41d8d18e6f5c2d2c911ccebaffcedd26882d265a771b666811bfaa9b54692998fff
+EBUILD gdk-pixbuf-2.36.12.ebuild 4077 BLAKE2B d873f478603ed3fee552d023b9ec88ecccdd6d56b128f383839bdd42244f7b7e662a29ce12904e7d7caf2f96d4912a2f0ced5fe25a3d81d0c02d8ff7a5501161 SHA512 27fc2acfc81f43379e2adfa0ae7fc6560e1fc63e88201779e67c92ab62be7ffd2770356c27339b737455c91790caf2bd70eee5117944b57ab3eafaed712764ed
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 9778d4bb90d1..334f896436d6 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest
deleted file mode 100644
index 36f421dab1fc..000000000000
--- a/x11-libs/gksu/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gksu-2.0.2-format_security.patch 1341 BLAKE2B 1ceb3ec4f117201d86cf0d110278ecaf4bd0482f275df03b6201b133d4b57d8deb12d687c6f565dc61993b8a74068149abdae852490352634feb9fc7954d5b21 SHA512 77ca1a3cdfdbe405869cc5a7375391c316552437c99accb1a2999d3d83f8a7d4b6915b62129f3e35e47d348d9ae6b8dae01958333e6f4a0f1b2b22161495cc39
-AUX gksu-2.0.2-glib-2.31.patch 870 BLAKE2B 63a65cb59c467b17eca4d69c824a83b5990819c214ae652a9fd368e2ceb4056021025503803d437e82114a7d1eb5929aec301bdd616befde47f6e7a8e8391471 SHA512 1ba77b6eef71629c6552766ebdf42271826b63bd124f38086187be4b8756ccfbd985127f10b35a4628d25f41fbaa7be89895a20241282476131da9486a0dbcbe
-AUX gksu-2.0.2-nautilus-dir.patch 2640 BLAKE2B 52eacaab2e59a45aa78e76760f720a7a9da3e03264176ae29446edab0e60292b50fcd4d34365feafead5ea5378b805fc080fa8728bc78965625005c952c48cd5 SHA512 d96e36ea8a9e03808214f5e8cc73eb2aef5f663ff0035c4eab854f8f7d313055d9e2b9058abc7b84adb5657e7a390d8e44b42953c7d8304377400b341a50729b
-DIST gksu-2.0.2.tar.gz 468121 BLAKE2B 42324abed0d79eb00454d23a95b356b023a25e39e1119860d7f271f56b34716e4d4f9084156beb526379fdd9bbe25f2c8591e56e40238d3a79e7b3d8ff4fca58 SHA512 8afde61e10c8a22bef3c8a5c2d90bd599d00ad9b71b30b2edc9c114be91ca8456e1af5c9db03fe02416424e50aa20c23eaefb2a8fd1db77aac37da7e85604f75
-EBUILD gksu-2.0.2-r2.ebuild 2296 BLAKE2B a91cfed566e8ca6ded271cb041dc1091006c8c46416980633558a602d2b197ff418143e9c7c88945b5cc5f321b216d1318a9ed269042bef73127aff2554d05e9 SHA512 8d52885bcf6974b9337fd3320b68c85920e3ae3f53149ccd4bbd96ea8efdfc9cbc0dd90d401259412fd1efbd023e2795b594a1804bb8bd816de3df1b6d723991
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gksu/files/gksu-2.0.2-format_security.patch b/x11-libs/gksu/files/gksu-2.0.2-format_security.patch
deleted file mode 100644
index ca87e9af9952..000000000000
--- a/x11-libs/gksu/files/gksu-2.0.2-format_security.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix possible format string vulnerabilities
-Author: Michael Biebl <biebl@debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643389
-Index: gksu-2.0.2/gksu/gksu.c
-===================================================================
---- gksu-2.0.2.orig/gksu/gksu.c	2009-03-04 19:25:32.000000000 +0100
-+++ gksu-2.0.2/gksu/gksu.c	2011-10-10 18:31:04.599677143 +0200
-@@ -146,9 +146,12 @@
-   msg = g_strdup_vprintf(format, ap);
-   va_end(ap);
- 
--  diag_win = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_MODAL,
--						 type, GTK_BUTTONS_CLOSE,
--						 msg);
-+  diag_win = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-+				     type, GTK_BUTTONS_CLOSE,
-+				     NULL);
-+
-+  gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(diag_win),
-+				 msg);
- 
-   gtk_signal_connect_object (GTK_OBJECT(diag_win), "delete_event",
- 			     GTK_SIGNAL_FUNC(gtk_main_quit),
-@@ -176,12 +179,7 @@
-   g_key_file_load_from_file (desktop, file_name, G_KEY_FILE_NONE, &error);
-   if (error)
-     {
--      gchar *error_msg;
--
--      error_msg = g_strdup_printf ("Could not load desktop file: %s",
--				   error->message);
--      g_warning (error_msg);
--      g_free (error_msg);
-+      g_warning ("Could not load desktop file: %s", error->message);
-       g_error_free (error);
-       g_key_file_free (desktop);
-       return;
diff --git a/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch b/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch
deleted file mode 100644
index fd711a321acf..000000000000
--- a/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 7 Apr 2012 17:57:36 -0400
-Subject: [PATCH] Fix glib includes for building with >=glib-2.31
-
-glib-2.31 and newer no longer allow most glib subheaders to be included
-directly.
-
-https://savannah.nongnu.org/bugs/index.php?36127
----
- nautilus-gksu/libnautilus-gksu.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c
-index 8e44d29..4acf3f8 100644
---- a/nautilus-gksu/libnautilus-gksu.c
-+++ b/nautilus-gksu/libnautilus-gksu.c
-@@ -5,7 +5,7 @@
- #include <string.h>
- #include <pthread.h>
- 
--#include <glib/gkeyfile.h>
-+#include <glib.h>
- #include <gtk/gtk.h>
- #include <gio/gio.h>
- #include <libnautilus-extension/nautilus-extension-types.h>
--- 
-1.7.8.5
-
diff --git a/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch b/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch
deleted file mode 100644
index bc21b56c663f..000000000000
--- a/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d7ee2b46dad2070982b035a3136ccbb5787e9ed4 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 7 Apr 2012 19:39:03 -0400
-Subject: [PATCH] Fix nautilus extensions directory for nautilus-3
-
-The gksu nautilus extension works with both nautilus-2 and nautilus-3,
-so we should not assume that the extension is always installed in
-/usr/lib/nautilus/extensions-2.0
-
-https://savannah.nongnu.org/bugs/index.php?36129
----
- configure.ac              |   14 +++++++++++++-
- nautilus-gksu/Makefile.am |    2 +-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 21d33bb..d65c586 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,9 +64,21 @@ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test x$use_libtool = xyes)
- 
- AC_ARG_ENABLE(nautilus-extension, [  --enable-nautilus-extension  Build the nautilus extensions module [default=yes]], enable_nautilus_extension="$enableval", enable_nautilus_extension=yes)
- AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test x$enable_nautilus_extension = xyes)
-+AC_ARG_WITH(nautilus-extensions-dir,
-+  AS_HELP_STRING([--with-nautilus-extension-dir=DIR],
-+    [Directory where nautilus extensions have to be installed (usually /usr/lib/nautilus/extensions-2.0 or -3.0)]))
- 
- if test x$enable_nautilus_extension = xyes; then
--   PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
-+  PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
-+  if test "x$with_nautilus_extension_dir" = x; then
-+    AC_MSG_CHECKING([for Nautilus extensions directory])
-+    with_nautilus_extension_dir=`pkg-config --variable=extensiondir libnautilus-extension`
-+    if test "x$with_nautilus_extension_dir" = x; then
-+      AC_MSG_ERROR([not found. You can specify the extensions directory manually using --with-nautilus-extension-dir=DIR])
-+    fi
-+    AC_MSG_RESULT($with_nautilus_extension_dir)
-+  fi
-+  AC_SUBST(NAUTILUS_EXTENSION_DIR, [$with_nautilus_extensios_dir])
- fi
- 
- AC_CONFIG_FILES([
-diff --git a/nautilus-gksu/Makefile.am b/nautilus-gksu/Makefile.am
-index 3a70c78..cbe4d00 100644
---- a/nautilus-gksu/Makefile.am
-+++ b/nautilus-gksu/Makefile.am
-@@ -2,7 +2,7 @@ AM_CFLAGS = -g -O2 -Wall
- INCLUDES = ${NAUTILUS_CFLAGS}
- AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
- 
--nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0
-+nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
- nautilus_extension_LTLIBRARIES = libnautilus-gksu.la
- libnautilus_gksu_la_SOURCES = libnautilus-gksu.c
- libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined
--- 
-1.7.8.5
-
diff --git a/x11-libs/gksu/gksu-2.0.2-r2.ebuild b/x11-libs/gksu/gksu-2.0.2-r2.ebuild
deleted file mode 100644
index fa4ccabcb3b5..000000000000
--- a/x11-libs/gksu/gksu-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2 fixheadtails
-
-DESCRIPTION="A gtk+ frontend for libgksu"
-HOMEPAGE="http://www.nongnu.org/gksu/"
-SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="gnome"
-
-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 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	ht_fix_file "${S}/gksu-migrate-conf.sh"
-
-	# https://savannah.nongnu.org/bugs/index.php?36127
-	eapply "${FILESDIR}"/${PN}-2.0.2-glib-2.31.patch
-
-	if use gnome ; then
-		sed 's/x-terminal-emulator/gnome-terminal/' \
-			-i gksu.desktop || die "sed 1 failed"
-
-		# Conditional patch to avoid eautoreconf
-		# https://savannah.nongnu.org/bugs/index.php?36129
-		eapply "${FILESDIR}"/${PN}-2.0.2-nautilus-dir.patch
-
-		sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-			-i configure.ac || die #467024
-
-		eautoreconf
-	else
-		sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \
-			-i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
-
-	# Fix build with format-security, bug #517664
-	eapply "${FILESDIR}"/${PN}-2.0.2-format_security.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable gnome nautilus-extension)
-}
-
-src_install() {
-	gnome2_src_install
-	chmod +x "${D}/usr/share/gksu/gksu-migrate-conf.sh"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	einfo 'updating configuration'
-	"${ROOT}"/usr/share/gksu/gksu-migrate-conf.sh
-	einfo ""
-	einfo "A note on gksudo:  It actually runs sudo to get it's work done"
-	einfo "However, by default, Gentoo's sudo wipes your environment."
-	einfo "This means that gksudo will fail to run any X-based programs."
-	einfo "You need to either add yourself to wheel and uncomment this line"
-	einfo "in your /etc/sudoers:"
-	einfo "Defaults:%wheel   !env_reset"
-	einfo "Or remove the env_reset line entirely.  This can cause security"
-	einfo "problems; if you don't trust your users, don't do this, use gksu"
-	einfo "instead."
-}
diff --git a/x11-libs/gksu/metadata.xml b/x11-libs/gksu/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/x11-libs/gksu/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/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 088a37e4dd5f..44b83825892e 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,8 +1,6 @@
 AUX 0.10.43-unittest-build-failure.patch 545 BLAKE2B 9157ee511bbc09a7cf9d091a4fc57250a533b8028e69dc3ace6d4b10ce6809b7f7d9fa1941505c12cba943657636bd69ad94a52f8c0bfbc5fa1e17ebced5b6c2 SHA512 2f0a4485a458efc7ad0c77ab8ada1cb1833834b1eb3fe3f0d623f963ba65555c5af53b9dbbcf9b1b75d54f19c3873820c839468b361ffca28e6734adab7c3ecb
-DIST goffice-0.10.38.tar.xz 2373308 BLAKE2B f270233adbbf300ad41516b1ed988db0772b95940196a6ac92c3090f6e52bc47933bb6bb4c023d7137cbca42adfab17fc41b82042c2e9c0340a6cd84942874e5 SHA512 1d72e30ee0b9f322cd4114d0a024a99e6d9ff7efcaeb9ca40b5fffe94180c232f03935743c15b1c6170f8bfc04fea5bdcc4d12760643c66cffafefbaa562fd62
 DIST goffice-0.10.41.tar.xz 2381656 BLAKE2B 7d73b892d91f917e3a47058f508094a16bb50860686dcf33c68ac8028b40e7ba74cc276f276672f29ddafef73b03887cf6280a2812305bd9b24ae3021c319d25 SHA512 d4b6a30b2b5d92e7500a1810626d20a2d4e5f66c1a879c904fe57df384bf4a480de322e9ae0a5fe7a44e73e060d9a33da6d56cd051c3d6cb1ebf0eae09fda2f8
 DIST goffice-0.10.43.tar.xz 2381804 BLAKE2B 60e305620118f80595a0dfec8192648273f845c9f868142adb957796ee291e1e53b0f3d3f2446064d8014ec54e7008ac03eca7f2f4925efa00ff42b98810371b SHA512 979ccf67fe08d09a2cf0413b4674a44208aa5f4802ab086a463ea2b449fc8c9d1c96dea7234c8e715064cf1726a47d2a5428728a2ff0d00759d5fe7017dc709f
-EBUILD goffice-0.10.38.ebuild 1254 BLAKE2B c412e0ae4ae8ada5a7d199313d915f7d4d9a1aead9742c271f9e741ec5d18159103cfd5396114b16f707647019eb6ae05bb7ca094d0ed4f805de7324c3bb5c77 SHA512 dd8935ebd5ecee474ab3057a440c622791aa83ee7a641c063f81b9c20cf207be766fcb468ad0c2d564af365606b810847b3bb7f167eaa472c1a7b18a4ccc8c28
-EBUILD goffice-0.10.41.ebuild 1256 BLAKE2B 0898222d5e823217463395ebeae4873563b16303bfc8dfb5f9b589c9dee4503d6fee42d422bfcd3fa622c5982f801613b19593e6ef88a18f611df0be0bbbd0b3 SHA512 a0df898947688fcad9e1d42df6cebaff68dc9e24cffe9ad3b97a441b28d61c318ce88ea95aa9833c032399ce02ac76e3f16334c0262d5c88e032fc43d0817793
+EBUILD goffice-0.10.41.ebuild 1254 BLAKE2B c412e0ae4ae8ada5a7d199313d915f7d4d9a1aead9742c271f9e741ec5d18159103cfd5396114b16f707647019eb6ae05bb7ca094d0ed4f805de7324c3bb5c77 SHA512 dd8935ebd5ecee474ab3057a440c622791aa83ee7a641c063f81b9c20cf207be766fcb468ad0c2d564af365606b810847b3bb7f167eaa472c1a7b18a4ccc8c28
 EBUILD goffice-0.10.43.ebuild 1380 BLAKE2B dae0ddb7c21e019690acb465722c91c124500972adba3e83eef6494270e55b8cb17428ee77fe67eadefd6d3623304a8d98c70a7101649b07c4077cc862c25b9b SHA512 84e08ab7de38952c5f409666d80d90e9430b93a64708549adb8576bff7b652b8c235aac400c3712b6ec816e5728a39d8997dbb77d7cc63c9d546902d77a3f20c
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.38.ebuild b/x11-libs/goffice/goffice-0.10.38.ebuild
deleted file mode 100644
index 6ce1d66a8ebc..000000000000
--- a/x11-libs/goffice/goffice-0.10.38.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://git.gnome.org/browse/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.38.0:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24:=
-	>=x11-libs/cairo-1.10:=[svg]
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/perl-Compress-Raw-Zlib
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
diff --git a/x11-libs/goffice/goffice-0.10.41.ebuild b/x11-libs/goffice/goffice-0.10.41.ebuild
index 75c08021059d..6ce1d66a8ebc 100644
--- a/x11-libs/goffice/goffice-0.10.41.ebuild
+++ b/x11-libs/goffice/goffice-0.10.41.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index eb83b1d746aa..cafd039c1f23 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -10,16 +10,12 @@ DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790
 DIST gtk+-2.24.32-patchset.tar.xz 6392 BLAKE2B cd3a7256bf0552cd483a59dfd856497f5d908edb40d73c25a336726b880872a219d03a7163226abca6155bfb34a38675817124a82780760b226265ea3fdc3246 SHA512 6c8763826b479c9c122bb991ae42b0ce0e754d460be5c6ea8d1bba28f7318c014822eccaae0b39c3b7c16804991c8c46c53cd8ded3ad6212830a2f5746567543
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
 DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
-DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc
 DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
-DIST gtk+-3.24.0.tar.xz 19273044 BLAKE2B c1ecf7f0cb5e58ce4b3b4f5422b0d479a6078f124cc101e5fabd57c32dd6d8c75c5c90da3db373ff9f71ecec64527adec432775a7ad8f87a85d8d9cdfae097eb SHA512 c82228f31a422d7f180b1157de697d941f2826f9a85a44d2a583564130626c88759a62269bb01f54969e00ff7499db4e1b026dbfb060dda1b6e62f36f3267981
 DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
 EBUILD gtk+-2.24.31-r1.ebuild 9836 BLAKE2B 4400023180fc795df2169345fce2a2cb2b315368a7874fba61eaf65e547ca75dcfd1a929930f7581114a7912a1b89ee5e94e710fd334a594270707a9e60b49c1 SHA512 027bcdcafb2a62f11f0b737d6ae46c8fa0331601ea8e166b7a9c13cb533b79af3c814c9e0e14747dae804c8c03072d8b6cbaba870145ceb678cabe14d098a63d
-EBUILD gtk+-2.24.32-r1.ebuild 10018 BLAKE2B f5de9e826c8c5f4afa70ec97058ab5347f1d66c3277243d2763c5c7e1a01a442c5d13f681615d5e96f5e66d922b1bc775fbd846b847d5d6c11dbe8e799b35948 SHA512 c7d5f6bfef5dbb1eb994a170857410c49619d3a3db67ff9e9ce615b29d6b8f2b1453ff8699cf2c816ab4e6ea32db355454fede4358bf82b9cba0743d1e68e576
-EBUILD gtk+-2.24.32.ebuild 9991 BLAKE2B 600affbb940664dc8765af635d394ea68472a0476acb9ee63347fc6bd08fd1a9c2a30b81e92c31731176dc8b2df2301df1bc42c6bfa07b184238fd6c3bfc4bcb SHA512 559c6691daac95ec50b503f682f8eea280cf9164a3e66b14dcf91e0ba11bb9d34c266aa340655590d6a784ee0d7afa7888866ad87a880e9eb19846bd43b5cc46
+EBUILD gtk+-2.24.32-r1.ebuild 10011 BLAKE2B d5d4cc484f22ea70b28417bac1d4c7013162ac58cb0528db6deab9d600f5a4e9a71d2afc4451b33c0085522aea8eb5a4fc9ef9ad436e40ea46a6b870ac70fc27 SHA512 88775c8002f2b1d92d6d56472ec94161bb0e0212724f8e2bcfabb890b5ae01c8f73cea0432ea20cf917b68735485c3744ba8db68740c2320eb69c546d55d7a5d
+EBUILD gtk+-2.24.32.ebuild 9987 BLAKE2B e678175fa76e2d44813e26780725412ce41df9dff61797e1f6953d806524460f64d9d39fa8409f197f5e488fd8f772c0f9f4cd6ea902a1b03894230a30e58e80 SHA512 ea0b57fe66e20337c71e8b2d2829c1ef19194064a8506455fe68fc51add54f6c58d48a162bc31d5d5d652e348356218c07d8a3bc383e7f7fbcd1147ae63ce70e
 EBUILD gtk+-3.22.19.ebuild 6559 BLAKE2B 3bd0611294ee3a3811e5d99c910e48c935e32acf991a4a5bd74826cc52d710883bae68354d07ca7249bed5ef49fbb22beab8adddccca1c18fc3cf162fba373ad SHA512 179ee609778c70342ae29ef0f25da28ed506eef801da98a396b3b3a039668e416a7a16892e698507fd47fc2ec6763806ff2cd75ae319301943d727d3b47f2725
-EBUILD gtk+-3.22.29.ebuild 6734 BLAKE2B e9d0774ca24b5db57ea83e4a2df0340402814150aad1c382bc89ad3ff7fb110f462aa1920c47a477c282f7f1fc1391d9afe908d4c34bc07fc80a3d23dad736e6 SHA512 908ec9a5128cdb285ce4745dbdf72101d36fae133528c86e2864c3852f5a75ab22b7c29d12f46608030da6a92e4bf55d1f8b855af7fa36336e232a2b9fead310
-EBUILD gtk+-3.22.30.ebuild 6735 BLAKE2B f33077d8b1411bfff2184fe84a9667e8257516301d50ee8238744d986724af1287682f0dc51241d65fc757549821230ee4dfd08defb1dced58f3ca92b3ed0d42 SHA512 00f615837f7aae0eaf0d1da586406128a5166709fa4453f40464802237afb4abc421c44b2bdcd45b013f2a86385ebb11000bfaf0d2697a8cfc54e5d78e0ae15f
-EBUILD gtk+-3.24.0.ebuild 6792 BLAKE2B 32c0dfea563e15d5c7f7671b4562f60a9eb231bdf70acb76ebca84554ed8c462256367f17438fe3e6f0e2696745d0fba5fd19a34cc1a88afe40861c87f70df6e SHA512 d683b4d197c90d723b29167cb1e4b3395665ad3ddf783e5ccdfee4d4eeea07fc2001a65d10b49896e48b841cd2f839672c203b3371ded916dd0ef48af21136ef
-EBUILD gtk+-3.24.1.ebuild 6790 BLAKE2B b6374402128bd04fe595825e5c4b91388125fd089ee1e0efc17f20b3eeb4c1aac30fef89e89d0bc5c255575bee2eb654520a7f599e553c981fa1b56604f4bb6c SHA512 fa52873c7722aff80f0baaa3dd85e7676d2c2794172caa36c1ff1da91198f9a384ec964fa817de044853363a25ff29d1d019d0865c491c0208df9336316f3e4c
+EBUILD gtk+-3.22.30.ebuild 6731 BLAKE2B f9d9819181e9908e4cfbdf0e68aa8792a1898ab2c20f7df083b624f0a086c6398a341b1c1dd7231dbb6d4cdfd730dd7d0e0a519a1ed168aa3db3e4249a439169 SHA512 f706634e33f37262d8f27aa40e16902ee646727ccb0062fdc49a0b9fc61a186a05e5a011fe0e3760b0864aee7870bf74b5a8c8b8dc89c868563240cd03cd4518
+EBUILD gtk+-3.24.1.ebuild 6783 BLAKE2B 0536ad9b75006a859548f35b63e02a7efdf0b6d968b962cca7c1e2b8291cd2866ab48162d4ba7cc3567a93df1a998de98f03796accb5dbf2f676367aac6dc36e SHA512 3fc6a1ad368cb0df72444ca3b56e969942ebe347e5db04b3951a61d252c41e0bfc65a48096adff3aea8af0de3bd63c0509c6b310a07c35acda48c66834a411ed
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index ecfe0cb6314b..bf8acfda0095 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
index 2d39c4ff0304..02b2af8e8020 100644
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.29.ebuild b/x11-libs/gtk+/gtk+-3.22.29.ebuild
deleted file mode 100644
index 7b364715e71e..000000000000
--- a/x11-libs/gtk+/gtk+-3.22.29.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.9
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	# cloudprovider is not packaged in Gentoo
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-cloudproviders \
-		--disable-mir-backend \
-		--disable-papi \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index 8d39dac9de73..d55aae19ae49 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.0.ebuild b/x11-libs/gtk+/gtk+-3.24.0.ebuild
deleted file mode 100644
index dfe5d458286c..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.12
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	# cloudprovider is not packaged in Gentoo
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-cloudproviders \
-		--disable-mir-backend \
-		--disable-papi \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.1.ebuild b/x11-libs/gtk+/gtk+-3.24.1.ebuild
index e5a1eb03d6ab..8764d73d082f 100644
--- a/x11-libs/gtk+/gtk+-3.24.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
index 36fc96b9cefd..8e8b52ffbcf3 100644
--- a/x11-libs/gtkdatabox/Manifest
+++ b/x11-libs/gtkdatabox/Manifest
@@ -2,4 +2,4 @@ DIST gtkdatabox-0.9.2.0.tar.gz 2836730 BLAKE2B 8ac4c3a4335fd5850d21ad035ed68292d
 DIST gtkdatabox-0.9.3.0.tar.gz 2883977 BLAKE2B d9d5de1c4d07bd01940ea6f75f2b2f455b46cf018dbae67bcb643f523353e675e1a97cfc10b696fe16aa0391cb006e5e866bef52cefcdd8ca4de057589164e6e SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a
 EBUILD gtkdatabox-0.9.2.0.ebuild 1361 BLAKE2B c46ca09796e744a86003aa8bf7945799ddfc062822e08d65d09cdaf0f9a9bea3712d9df363d75f5f805800b399c262976d9ac8fdfa5d476a853349cce5d257d3 SHA512 fd6e782fe5b326fe61a4be6155cb2a8f70792e7a793ec09e4f0b00692fbd614e61be5606fd7cf99385e7e7fd0074af2fa0ecdfdd8c3cdf9f7ce99d840660891c
 EBUILD gtkdatabox-0.9.3.0.ebuild 1298 BLAKE2B c97a446cbc8049de77daa309c05b861889003baabc2f506f9034b39f7b26b8465d038012432531434ce556925ee1f664d2d378f75f89fdeeeb1ad4b1f371dc7c SHA512 cc43c4eadfb0a1a5edee1dc7e379329ffdfdda6c34081ca8a7676b1f8a3cfa62ae17f58853f852b0fca3cc82b2c86c1cee454df1830c2066a4f86895d952150d
-MISC metadata.xml 685 BLAKE2B 898125976ad823532004cb9a63d89121fcd1e44ec8fe1f597a9b2b140ffe12258c3c0f8c1c0c3352caa518e633124801e5961fdf00311aac32d12e033900aad5 SHA512 c74bdb14d98365cc3941704371125c9f482cbc21d34c0d09b3f13560cbc362d489f9eda8e4ce2446c26c2d8aba98e7be6e5a014598eb331a312d89f4466c2911
+MISC metadata.xml 581 BLAKE2B ff0d8d541a11821321883ac414d4de93a7e2a8daeee8e2e4540c72018775a8b37b83e52d97df8e7fc279e0c629fc9d46f9514dfba55e30e64eadf00ab100f8af SHA512 34e6d588df560865aec420e4d400c13e931bf97d402fd8ee5e2ee1df8ebe6df8673bacb59c14f8ef258165d0802e160c8f105648fcf42eac15ed888f267b87fa
diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml
index 54b59b40ec8d..74c404fc5067 100644
--- a/x11-libs/gtkdatabox/metadata.xml
+++ b/x11-libs/gtkdatabox/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-electronics@gentoo.org</email>
 		<name>Gentoo Electronics Project</name>
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index a5c6af302ab7..a7023bc24f44 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,9 +1,11 @@
 AUX 2.0/gentoo.lang 3910 BLAKE2B 12fac758dc1c8029a87e2cb24e477e7ca037b34d89a6c68281b95f34c993f39c8c47b56c17209d84e9a72a818e930f8c1b89dbe7986530a879293b496504b418 SHA512 245fe194ced813fc1cda732d446664af85a7cd9f4443ba6bec14aacd5b6243428e23100fb6f9099004d20b7e52de9bee14f4017f754c6d915c3db580e0a6f8d2
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
-DIST gtksourceview-3.24.7.tar.xz 1390500 BLAKE2B fc8c6695ec94f8c0ff44fbf96fa3c1f8e11d11c9959a8b873d25e420894208444f1f88624d49f7366486039f0e1590692e2b5b0164c08c1358a8ea8b0b4aeaa3 SHA512 d86ef2bea6ae24c128f65e314c82f58265a53309abff22630360b0f5a5f9b640e3fc31fdd58b06221efc28f41c95c0f92613edb8c0a2c8f5c6147d287310a9a2
 DIST gtksourceview-3.24.8.tar.xz 1408964 BLAKE2B e406aa9f776821abfcc87333fc955b4f3ae334f73a8b1dfa0b123067df24bd4f473e326347c99df7dc6c97adbdde8739cb301e45ca70324f6e8de2ce9e1ea973 SHA512 84a02278344f9fe3c1b8f2440c6179feaea53df93061c63023d92bcaa1ec7ff8e95e1f3a463c23d8487c74492469f3dc367bcca3975ef169bf03925ecee7f7ff
+DIST gtksourceview-3.24.9.tar.xz 1414444 BLAKE2B 9d148fba03339c7dccca70822f498aea6423125af1a954e0c9f8ff9735141fc9e4f845c7172be5faf97e694445dc95d41d5d903ef5b5da3dd0ce7fe58b524ca7 SHA512 29b58afba1c0b473205cf7070997139d2ca07cf68d40185aa76fa59c900ad21c03ccb79dec9970e5f96743cfdb5a7d926b21a9947244bc8cf8cbd1033467cd01
+DIST gtksourceview-4.0.3.tar.xz 1396640 BLAKE2B 5e5f84597c1f75a732ac487c2107eb54be2740eb2cabd177aec76cb4b2504a32969c4918e2a1294e9d486660090985a4f588dbde49f241fbb1493eaa3daa335b SHA512 d3f7512bddf247166c12dc38bc66d55e44c1830f9b8d62758f06cb7117e33f8908f4d8186b9d7e77514623a58f3a973cc75e3fd6a09c5f891f8b948012a76955
 EBUILD gtksourceview-2.10.5-r3.ebuild 1371 BLAKE2B 07d773c8d95b87d929fc337d131d3c334a7063be8fd0af0d83631e02e14357aa3f57773f72f86c38b296e73fa8cc91b7d5e873e20041938cd5a214180bad921e SHA512 b4fb25286017d10ed43035293ed1bc7bd5e89b13ed411d3b3d22cfdc551dc2447c0ef21dc0efaf7c3ecb21b1a69c7d9f5dc9f15b78c358005f17987085f6b04f
-EBUILD gtksourceview-3.24.7.ebuild 1341 BLAKE2B 394f5dd3f61147fb8ec00df11f9d3b2fffe3bbf6bade00e816509753f842110d1bcab10572b901f1825bd937d05c50e6d3e7a05fc6646dc77a9409cc35dd4291 SHA512 354e3549b4b61259abaa4e8ce5a1f4bc191adee90ba9ad1ca8adb54796d86141f498ecaf35a7839149f2e0804172448a3dac700371951530c9cbff3bd7a6891c
-EBUILD gtksourceview-3.24.8.ebuild 1345 BLAKE2B a8a71417dda953fb6d65fe1623fdea25f4f0391cf023afacea5526a8e6970927001dad3a082ccea6ca73315d4abcfce8133a3456b9bddea199f31809c502c511 SHA512 51af10e87dc030d45f4ffe3d9dd2e2d1f1568828fd22e0b5858c2b4b62bcf44458a503d956fd56007be4e23d3c7d35480cb3ce70259c905ed10bf487b278fba7
+EBUILD gtksourceview-3.24.8.ebuild 1341 BLAKE2B 394f5dd3f61147fb8ec00df11f9d3b2fffe3bbf6bade00e816509753f842110d1bcab10572b901f1825bd937d05c50e6d3e7a05fc6646dc77a9409cc35dd4291 SHA512 354e3549b4b61259abaa4e8ce5a1f4bc191adee90ba9ad1ca8adb54796d86141f498ecaf35a7839149f2e0804172448a3dac700371951530c9cbff3bd7a6891c
+EBUILD gtksourceview-3.24.9.ebuild 1305 BLAKE2B b486efcf25b6d39c0e8f58b5a9e95a7ef56a5897d1999f9da080ae07b11c5b24b893491739f687c73e70c4ae401b746726fc6347bbe653b28ecb474f170ca4c9 SHA512 ec64b1481ed1ac8262cfddd3c2d1d47b4fd87dee2cf5f4a9fb480404e51f8a8e20496e90ac27971fc4d928cfe6601fa3d1a35f3235d1a5f5ef8b43ececbeaf04
+EBUILD gtksourceview-4.0.3.ebuild 1646 BLAKE2B e0139497e27c2c4bc33f58c4cefab414c73975be8adcab92d52acf2ae51782064f5912a2fec89127b4bb7deda4ebf1fdb89d5505aa8a71829e1bafd2e62295b2 SHA512 b80508c144dc81278df128eff1c6e226623a5d10ec1f62d83f0e98f385f288dcae85243c82afb15c046c7ff6253d1ca08f1efb5469eb3a8f90a650fe6eda7ce4
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
index bfa6c8c42b3e..6b5b4cdefa25 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.9.ebuild
index 6b5b4cdefa25..f1f99c3904a3 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.9.ebuild
@@ -13,10 +13,10 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0/3"
 
-IUSE="glade +introspection vala"
+IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
@@ -29,7 +29,6 @@ DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
 	>=sys-devel/gettext-0.19.4
-	dev-util/itstool
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
@@ -41,7 +40,6 @@ src_prepare() {
 
 src_configure() {
 	gnome2_src_configure \
-		--disable-deprecations \
 		$(use_enable glade glade-catalog) \
 		$(use_enable introspection) \
 		$(use_enable vala)
diff --git a/x11-libs/gtksourceview/gtksourceview-4.0.3.ebuild b/x11-libs/gtksourceview/gtksourceview-4.0.3.ebuild
new file mode 100644
index 000000000000..11d83986d255
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-4.0.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="4"
+
+IUSE="glade +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-4/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+
+	# Avoid conflict with gtksourceview:3.0 glade-catalog
+	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
+	if use glade; then
+		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
+	fi
+}
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 69f8ad423909..9ef893830170 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,5 +1,3 @@
-DIST libSM-1.2.2.tar.bz2 348908 BLAKE2B f3d6d40bfb3058000fd13e9f5ed8daa6628ef197d737e9186e66a517d4c0d4238fa65d0f922b9e6b2839a6f37344c64a560b126911679315cb3824c814d474c7 SHA512 dfb91dcc7200fce8d0a62953ae4b81fcb00d525674bbcc6dfcaa23ecb35e1213ceb07cc51f590072dce2107909903160d9f3636a0434fe2a605b1e9a9bd0a6ca
 DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
-EBUILD libSM-1.2.2-r2.ebuild 1716 BLAKE2B 929e1c043c04cfda1ee1805cb0db16a120a606628acf25feb09528db7c4bdec0b975398a7a413bd212936292cbde3217c938dde3d0157b57b9389999071ba305 SHA512 5d43444bb8e99a89c79cde615359d7ddf3f326428d8a368282e19f9df4b405ab146040c22c674d4eb5818059aecddb3125484de0e18859c08dd6b8fb20986b09
-EBUILD libSM-1.2.3.ebuild 1717 BLAKE2B 459e894df4723a9dbe26047a706664586d58281bbbe7b9c6547e3725da33003be7d063470ffd681bc6fb084889806f395e2ec5e3e8f2766df83f22a9a7d1be05 SHA512 2ccaa43d9df04e5b03ed039aeba78b7b3d04fe6016d42171f1104e752c96582ef978a9888a8986204f1740c29ecc6dc01d61e750e5e070c61a87b5798deaf609
+EBUILD libSM-1.2.3.ebuild 1713 BLAKE2B 8c058818c184dbc7572cdefab8b1d711388bbef2cb4b0eb3c5bd1e577c7ca9fd1638264b179f928420940ff948f1ddedf00f60ce41913588c1f5b026642d0ed7 SHA512 4ce4bc745da4412b86159ae76949c021b72f46fc9ea8e33a4f14b7932969fa47ec26d1db6263e2feb52d9843e9b2e7f164b09e077de40ea2952c932a71b6ee0f
 MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.2-r2.ebuild b/x11-libs/libSM/libSM-1.2.2-r2.ebuild
deleted file mode 100644
index e34a0aac36c4..000000000000
--- a/x11-libs/libSM/libSM-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Session Management library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc ipv6 +uuid"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	x11-libs/xtrans
-	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
-		uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
-	) ) )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local withuuid=$(use_with uuid libuuid)
-
-	# do not use uuid even if available in libc (like on FreeBSD)
-	use uuid || export ac_cv_func_uuid_create=no
-
-	if use uuid ; then
-		case ${CHOST} in
-			*-solaris*|*-darwin*)
-				if [[ ! -d ${EROOT}usr/include/uuid ]] &&
-					[[ -d ${ROOT}usr/include/uuid ]]
-				then
-					# Solaris and Darwin have uuid provided by the host
-					# system.  Since util-linux's version is based on this
-					# version, and on Darwin actually breaks host headers when
-					# installed, we can "pretend" for libSM we have libuuid
-					# installed, while in fact we don't
-					withuuid="--without-libuuid"
-					export HAVE_LIBUUID=yes
-					export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
-					# Darwin has uuid in libSystem
-					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
-				fi
-				;;
-		esac
-	fi
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc docs)
-		$(use_with doc xmlto)
-		${withuuid}
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild b/x11-libs/libSM/libSM-1.2.3.ebuild
index 948007c4ffd0..54e95364d4b5 100644
--- a/x11-libs/libSM/libSM-1.2.3.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Session Management library"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 2cc211b70ee3..cd4cf0b01d30 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,8 +1,6 @@
 AUX libX11-1.1.4-aix-pthread.patch 300 BLAKE2B fbf3b97b3c7e70875b28a6813525435d37ae1aedaf62b0aed499303f60585ed1e3bebf9ca93abe64c8556cff9a96b4591537da02626eef81590968bc4fd35bb9 SHA512 53680a5ffe7ec0892d3e39414ebdffe466c3a98494b164efa5b21939e9e981abea16929da249c6c3a72315ebc3ad297352cc74877d0610d2dd5537f324f0827b
 AUX libX11-1.1.5-solaris.patch 246 BLAKE2B 38bdf941f63ff7ca3adb13af2bc26e1248e41bc84ad47b58db88d63a0994ac4a30841c85a1d9471686fae517f95edbf5f514c7af7b90d79203e1ba72d4c8f1ac SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878
 AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf3fcb49f0e3a3acd43e4d0c1b5dcc3fe2e9a6556171f7d55712e37dfa6dc54d1c2463b872f310629ea24a131f945a55bdd SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251
-DIST libX11-1.6.6.tar.bz2 2342730 BLAKE2B 7b3936606a6cf8981d691caa06b2ebbf2383259a4b74ebc6fa72277ce4870222d7e797037f21cd669dc1f1177f5a08f7fdd5d0158b6579c3ca3d0587a3e4e950 SHA512 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7
 DIST libX11-1.6.7.tar.bz2 2290260 BLAKE2B d149d3eacdb1cd80de378076dd96bbaa2cf0cf24d4431ed1afbc00f6ff43cb5dbbea01345230e8b06cd05900d77d4771a72e3b8c5ddda69cb25c95f02a58d9ce SHA512 edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5
-EBUILD libX11-1.6.6.ebuild 1278 BLAKE2B b77b105807f0740d4207a1dfb980532f91f06d4b1ba4bd0575e9cd14976597afee960ba722315839cde89c883d7054b0c7a94c98dbb115cce2ed7259ec188a73 SHA512 e521b1fb9b085feda4ea22ccaa36b2bbfcfc5756287ecfc3dba6823b6dbadc2620981b15d6b2e22473005cb3fe7adc6b5382eeeda18331e7c5e061457817ca00
-EBUILD libX11-1.6.7.ebuild 1279 BLAKE2B 9ccb6423c46fc30f871bd87a3f5ef91a1474373d7a52cbda3249a8923ddb4350fce8dfc8174885264378a56fce94dbe0b473bcb5136ab68cf1731d4625cb10cb SHA512 8a903008a4a9dc74415d9b7645b63f1c85593263f8fe804de896df66a329400efe86aae0dd9efb3ff392601f8fdc9eff0ebf5c7ca5fabf40fd427b1482a4ea14
+EBUILD libX11-1.6.7.ebuild 1275 BLAKE2B 324472364a66554d650744d27a87b8e05f42f21f7b1cd8bc44c096f469a5d973816997b4b97b3a37765a1b8bd258ac105d8685a1d817f2f3a759de10554672c5 SHA512 36074d9c031dd9176cbec2209e197c67e59741c00e036bad7116eb8629bb403ed5a9c2f0029d2e5e4be755e15e6d5fdcb7a3805f2547f5241985af4814d905c7
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.6.ebuild b/x11-libs/libX11/libX11-1.6.6.ebuild
deleted file mode 100644
index 765aa43ccd5a..000000000000
--- a/x11-libs/libX11/libX11-1.6.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_EAUTORECONF=yes
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="ipv6 test"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-libs/xtrans"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
-	"${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
-	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	)
-
-	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
-	xorg-2_src_configure
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		# Make sure the build-time tool "makekeys" uses build settings.
-		tc-export_build_env BUILD_CC
-		emake -C src/util \
-			CC="${BUILD_CC}" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			clean all
-	fi
-
-	default
-}
diff --git a/x11-libs/libX11/libX11-1.6.7.ebuild b/x11-libs/libX11/libX11-1.6.7.ebuild
index fa77cee008e3..4ac7df9912d1 100644
--- a/x11-libs/libX11/libX11-1.6.7.ebuild
+++ b/x11-libs/libX11/libX11-1.6.7.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index f8ee99ce3c6d..002c0088462b 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,10 +1,4 @@
-DIST libdrm-2.4.93.tar.bz2 826579 BLAKE2B 6b2775a6bc631001be874d1337ef9607ee8ff5b86ce5e3d8ff6c6eb58182a30e2c70592cb4eb9e88c9e046d73b510f632272c57621706afd1db416acc6ce366c SHA512 ba4221e8d6a3a9872fb6d30a0ea391e30ea0e17f249c66f067bed9c2161ed1ad8083959cb2c212834c6566c3e025f4daae31e9533d77aae19bbbbb9de6c2ab3d
-DIST libdrm-2.4.94.tar.bz2 829060 BLAKE2B 99de0fb3df6ea9bb5540cf0e3bdfe182c28db9876f679030eaaed1abd873bb818586bc07e73e0499f831ccaa7ede91a5b73b2b2bf681853e14e786a4af9abd98 SHA512 1a1699d6ea70b8759b37f3863e0802a99430b58f02e62632ad451356e2463eaf6faf4b810323f7dcc85ffdcca28f674b32caa5631ebd65b83e5b86bd59a35937
-DIST libdrm-2.4.95.tar.bz2 820722 BLAKE2B ee12f1b9fabc0a00f5adba33fe17000d018cfd5d7fbb4e737bceadcd8e897b846fcccdc262582c4d37508738671a0fedc1a653976214327eb998dca7d5834e01 SHA512 9bf8178a871bb059471f58f236c8362245e08877b732b2c8366d402e8066c9a74707e4ec3bf680fca12303f1319875edc98ae8e31bc9826f172798f47197e631
 DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b
-EBUILD libdrm-2.4.93.ebuild 2113 BLAKE2B bd75b9274d572854c30020c44ad6a59ea91c563709f2641483f18355a8b10e6780e377e8853255c761c2f967e22b230b71fc208b85a63dd59d04c22964a54835 SHA512 650a6a3dae11732881598e9af1ba7c1966128840069d1f5408d66f5d26f5ce7180e1e4f9edb0842c52cce3fc35f6f88cca5bc4dc53bb06a5be322c8a5e6eaea6
-EBUILD libdrm-2.4.94.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
-EBUILD libdrm-2.4.95.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
-EBUILD libdrm-2.4.96.ebuild 2112 BLAKE2B 6ea4d7f1d739fee6f8e93372487ba358b14ca70986126130e96b8caa6fde964df771d1e96b35c93ff5f8a4dd876ab94e80e57fd84f87a945379b1ff5ddbc50f8 SHA512 263de76f1afbc7a64c82fda91ffd64a6490ecd31d9480ff522f8d438544b8d250af39d30dfa5de6b33d732340db3c517a3b8390b0d5dd0decafd768eb4720f2f
+EBUILD libdrm-2.4.96.ebuild 2109 BLAKE2B d310cf95468e4f6f2253882704bac6501c0b5eba9ba768dafb17c6dd05349643693beb2a1466699ee6aaad4f1dad3e5553cf1f65e582448b1a0b67425c211859 SHA512 77af0738dea6fc2ae85ef4cd80d201cce73b5ff02a23a3aab5bd55bb4b041a4adddbd53a70470f1df4aa223055c80d433a3085dcabe50fd91349ffd44fd3aef8
 EBUILD libdrm-9999.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.93.ebuild b/x11-libs/libdrm/libdrm-2.4.93.ebuild
deleted file mode 100644
index 11d0b618285b..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.93.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.94.ebuild b/x11-libs/libdrm/libdrm-2.4.94.ebuild
deleted file mode 100644
index ec0bdd16c350..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.94.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.95.ebuild b/x11-libs/libdrm/libdrm-2.4.95.ebuild
deleted file mode 100644
index ec0bdd16c350..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.95.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.96.ebuild b/x11-libs/libdrm/libdrm-2.4.96.ebuild
index 616ecda742f7..e171872afadf 100644
--- a/x11-libs/libdrm/libdrm-2.4.96.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.96.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 49e82924235a..e107cb76aaeb 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -2,5 +2,5 @@ AUX libfm-qt-0.13.1-check-if-app-exists-before-opening.patch 2010 BLAKE2B 3f33d7
 AUX libfm-qt-0.13.1-correctly-handle-mountable-types.patch 3498 BLAKE2B ed7a0541d2bcbed1afd30d0045f676f179a0c123376afaeeef29260107f80ea8b0cf89a3a55f4e004fd11a6157b4ef2d3c092c8ddedd2013bef321fb59728660 SHA512 3bc193a1ef82bbe64181e596e082cbcc26b60f1cad8f05cb1d1fdcc1d162af21f8935179e3cf8ff370a7640bd5299a2ef7380436f80f9c620489365fe76c31c3
 AUX libfm-qt-0.13.1-fix-smb-error.patch 11579 BLAKE2B 4a0cdc5c9579415a3334de6295cae8ae5b9a4fdbbd0ecf647484b58edd3c6bed07fc0b93050a81c6d0d55343ea3b0f554cde536f6873ce3db057a6da3e6c267a SHA512 cc00a79ceac417d969001ac35b3c65bb6b437b3c98c62d5e70ea1e23b1a0ad0e11f05ad5c49cee64cdc23b16121ba14a8fc8978aa42b4ba6c64da00f07f72f8d
 DIST libfm-qt-0.13.1.tar.xz 191972 BLAKE2B 760847be1fbb209003bd2b61a9c475ccf57721c469927039518a5f65543b8264c32f3e2c66c867be0b969fdf4636fb82cde0b2bd4e77b1365fcb9f61b0bd02c8 SHA512 29b8f686950a7b0ea86468d01ca64a6ff8316ccd5f0144808a4332692cf96199431470880a9b560780efeba7add833ab6a0d9b4b24220f8fb7091cc5ef151dc8
-EBUILD libfm-qt-0.13.1-r1.ebuild 1094 BLAKE2B eb12936a58ed4f3c8893fbecd0909cd58256d2b934cfd8301524e599cccef728ede24ef62c6a781bd88eab2d93a359bf816b2132163bb9aab2663d92d142743b SHA512 cf39485d2e53a40c43d61797915f0cdfe3cfcb94c1efeb18c17448a0f627927e8ca5925e29f513c3a355ae2ce21de42927f69514cdef0f891ed9f9a6e16ba957
+EBUILD libfm-qt-0.13.1-r1.ebuild 1095 BLAKE2B 7e1463e541f2676d4ece12fad6597ffe37cb6fc28af5d5c1c8206f7eee3c63b7c5367f3ea23a2ae15c9acc30c7ca0262e460734ba610438419255e031bd0b049 SHA512 60ce1fe6b3a84af04aa4ae4664fa2ebda0dc3173626698616d863a82506b48dbec8cdac67b8f111e09cb484a2bf709ee7643660a1fe320c92e89cfe9d7aa1f23
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
index e41d449e1331..c25ffd0252e2 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
@@ -28,7 +28,7 @@ PATCHES=(
 RDEPEND="
 	dev-libs/glib:2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5=
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	>=lxde-base/menu-cache-1.1.0
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
deleted file mode 100644
index 8ce52b8233ad..000000000000
--- a/x11-libs/libgksu/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX libgksu-2.0.0-fbsd.patch 2847 BLAKE2B fd7d41e5ff64164bb3954e3ddca9af47477e9bb9dff67c8c5e8649b39b1d372ef50a86b79c2c92f616d786b6585fff36b5ef467ed2cd128ea43981bcc45ae687 SHA512 8c99781e617b7fa96d9ff019a42b362c18f107bf335fbd591c23ac49d9f8ab4ee15a633968a60ba3ae92fe2004f4cdbd4d69b7f7c60c8d5abbd3db90c632c9be
-AUX libgksu-2.0.12-automake-1.11.2-v2.patch 2074 BLAKE2B 15cf831d6646de360579efb651238a628c9cede514532c6fe662d050e41e36cfae98179e9b544f7e6a4fa424793626852e18224db0ef1f9521e968a5911630bb SHA512 b7b09e23e2f947b37cdf5f8a299e7f2f7e6f64b387b1b388c36d29d8e44872dc0d44e0457485597e1cb4da6713d45495cf8a4da5b0942b768dc5434cf462ccf4
-AUX libgksu-2.0.12-automake-1.11.2.patch 836 BLAKE2B 39737f6783e1b2b08952796cbc7658c44db5e5260d7cb66e0a32be43b564718e93107afdc0f4762ee5463af95af810884849c6df05b38e8dc706493fea5bd1ea SHA512 f4509984cfcd2de42a786cd111c980a985fac21956042a4d68431503f5d2f7fb28850052d876545be538a8bdeaf7a0cd9f7df823ee3011149c6f819e612fec8e
-AUX libgksu-2.0.12-correct_colormap_get.patch 507 BLAKE2B 11b70cadf9835b7f995e7babaa192dbf53833d592661dc676ec93f41022b94a4194dbb03dd35707087305d59b09f07a65fbc6312e045638bf04d0bc16c2a9d4f SHA512 14da334403bcd48bf0e697eba115e2533cb0dd188ea69535d24401a71e40004c474f0c889d3b1096e2d47880fab9b12bd6c814abbb0bfed80275825f05912bbf
-AUX libgksu-2.0.12-desktop-validation.patch 507 BLAKE2B 885bae4c59ec44900707be8e4a0e1de2e79133c8617ac815e22019238ab62da17c99578308b49d268ab42da4829775468b7ab802dc71dc6dfbb474b5e603b4ef SHA512 768a6ce966eec9f55f70e87122d557fe861545b120c990835386e17e24b2f3ebab744d5bb945fadb92513f70920cfbb4de6060f76f1a0cdf2e08fbe52cb327a7
-AUX libgksu-2.0.12-fix-make-3.82.patch 670 BLAKE2B 11de6cc8997de852a2fc5d3ed89a0dca851c257de88da9f35c54c90b553bbf974c27b634030d008cf6385045d5585bf0b1cfee8039cb36699cf3044b1e5fff51 SHA512 2711ea9d67ba327c28049a0ec260d3b15a5f3fbc327f242943c3ce0519575d92db64bbf3f33271260d276092f7d717048aa82d9824d620d32b94370036b2548a
-AUX libgksu-2.0.12-format_security.patch 1019 BLAKE2B e5a261e630089607cc1c28f46dd13a90195fb6f5bce411ac6c088ac653a0fca6ea5d24515a4e0d085ab1288bf62192ddd2ddaa67e826b293b1fcf353160c1eaf SHA512 3d6772a1fb2ea9f2efa90e229151236a192aabb43980532e8dfe16d811be40ce054ebd7ed3c0a8451a0ba93e21dadc09de8bbfecfb2d71e062d964693f4d8853
-AUX libgksu-2.0.12-g_markup_escape_text_for_command.patch 575 BLAKE2B e15eef5589d6f5bfdc382cbb4169968e2e074a2dadcfdf5b87f4beb37ff75467d487b83b9bc69ddd48204df00c4f5726b3140eed0ff15f9068b0199f749932bf SHA512 e881a34642659874480eb91e1d5e48effa4affa36357b67b83c3dacaa7f05fc3c2e1cd4d9363530eecaf88f63a9677cc413679d4bc342d981f9bd955299c97a0
-AUX libgksu-2.0.12-missing-libs.patch 728 BLAKE2B 9bb306ba73377bfca2abb5277c3ed016a6ea9931ba3728e8aa809e2619c0a19ed6a84e5b831278e7fb0d96f63434f2ae40aeb97abbeb36b6bf1b67e480164571 SHA512 c1478771c77708d9828b0aeb26dfedafd5b5e20de4e2e778d60375dde1b343e707e50c704ec367ce00b01bcb295b8d253e52b615692a6b5a68c7cbeabfb1f3fb
-AUX libgksu-2.0.12-notests.patch 1060 BLAKE2B 596196e5b4f631c82441969efe22066c698792ffd6ebbb53cecc2d1f80003c443c92241386f54c14a7cc405c8240a18c77a7f921bd362a50e86bc4a6a66af21d SHA512 359f009101e7d12cf2c4be2d03eb7a65944231941ae49813be84ad1609db843c31f8e28f0efe739831b33a1f287c2800d651adf299f36a7bdf7498119eebb19e
-AUX libgksu-2.0.12-revert-forkpty.patch 11018 BLAKE2B 465f25b40be1d507ce5d0f20d6c2bd580e2791425ab019de1a2b4bcc10779032c69ec45f2091ec8006a014c29b792921f5fcfb68c94b78c71c32f4643ba73d9e SHA512 1e4572774c28a8c9e48b790df80553b5222dfbe04dd52062d9e16687c826aeb59a67c813327fae1ed1daa3e820258b59ed0bcb54223eeb05552c8a753bc707e7
-AUX libgksu-2.0.12-sudo_keep_env.patch 347 BLAKE2B 7b2f5502da0e4083e242c23658c9266987387d34740b4208c56f091f84338af67c6faff5e137e441998ac323124b7f62e0224ffad8f183b03ddd448bb2fcc03f SHA512 ed4d4a2458b5a9afc11c6e3ecb02df43df97bd2fcb920ab79cbacccf5acccbd07fbe8a34212386b1a8331d9b788bb5ef0425da98c85a384f488ee9c128dbca67
-AUX libgksu-2.0.7-libs.patch 3129 BLAKE2B 1ccd6e9fa0dc83c0853375e17c9df1e243b91f030fb81b2d2a7fee0c5f914a6a4c421f371f38555ffd034c0d4dea48434e618742b2b8c09cf22c913eb7961602 SHA512 9c68a54d2f7cb3eb30d070a6946f9416fdf2e2690705f42289608d926aab3cd0742dd3510c262dcbe1b5d81d579f671770107f24366126adace085df2ba54b48
-AUX libgksu-2.0.7-polinguas.patch 749 BLAKE2B 8b8b675686d23cdfc1b30e0cafcb653c4ae3485413f499172f77396f06b1a4dc7da0ec1b8657d0d7926fc6f674b8bd2b033cb809b2451bc7130e215e4a668fb9 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103
-DIST libgksu-2.0.12.tar.gz 477903 BLAKE2B c4a130b43d1e9acffd740b9160f98ed318f9861db90acaa047fd9c2a162707fdffa86a4b0854b81486f982099f9440ee7d5b8c5ca65122e0cb2872e3a8aa508f SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573
-EBUILD libgksu-2.0.12-r3.ebuild 2029 BLAKE2B fc8def81a770dae2baf3b2def02f5e94aa741798adf2e4b0d4b202598729959e7af0f83df1a76a79038dc616e0c51ba403826fcb25e52aa2f88ce145ea9d94e3 SHA512 db47d0e8a0184976671ff1b616962ccaa5ca37b61b73d7a83bad2badd5f0799d2d3758edab8276e607018edab1708194516e0c4946f17866031afa6d43fdd089
-EBUILD libgksu-2.0.12-r4.ebuild 2074 BLAKE2B e7c6471f434ed493d0fce1ce5708878be4b7f08b29249b792f72ebad33c6de4564dc8f2d63bb798d23d6c4e948e28adba8dfeeb7671f1863ebd474a392f201d4 SHA512 cc86c6acc430e8eed40f8ebd2f87c5b49549df3d9cd0a69df402c0ff1d9c779636bfccb823e16776222e920c11cd9c2c6397c8474edcd7a6ec2e7e64640e3764
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch b/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch
deleted file mode 100644
index 5c007be5b4b4..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c
---- libgksu-2.0.0.orig/libgksu/libgksu.c	2006-09-14 22:35:51.000000000 -0400
-+++ libgksu-2.0.0/libgksu/libgksu.c	2006-12-12 11:28:01.000000000 -0500
-@@ -23,7 +23,12 @@
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
-+#ifdef __FreeBSD__
-+#include <libutil.h>
-+#include <termios.h>
-+#else
- #include <pty.h>
-+#endif
- #include <pwd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am
---- libgksu-2.0.0.orig/libgksu/Makefile.am	2006-09-14 22:35:52.000000000 -0400
-+++ libgksu-2.0.0/libgksu/Makefile.am	2006-12-12 11:28:01.000000000 -0500
-@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe
- noinst_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
- 
- EXTRA_DIST = libgksu.ver
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in
---- libgksu-2.0.0.orig/libgksu/Makefile.in	2006-09-23 15:37:44.000000000 -0400
-+++ libgksu-2.0.0/libgksu/Makefile.in	2006-12-12 11:30:09.000000000 -0500
-@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config --
- gksu_run_helper_SOURCES = gksu-run-helper.c
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
- EXTRA_DIST = libgksu.ver
- all: all-am
- 
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am
---- libgksu-2.0.0.orig/libgksuui/Makefile.am	2006-09-14 22:35:31.000000000 -0400
-+++ libgksu-2.0.0/libgksuui/Makefile.am	2006-12-12 11:28:01.000000000 -0500
-@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE
- noinst_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in
---- libgksu-2.0.0.orig/libgksuui/Makefile.in	2006-09-23 15:37:44.000000000 -0400
-+++ libgksu-2.0.0/libgksuui/Makefile.in	2006-12-12 11:30:22.000000000 -0500
-@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
- all: all-am
- 
- .SUFFIXES:
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
deleted file mode 100644
index cd24235a05e7..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2-v2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 8137cbfa13954b10cf349eb392166c677cb78ff6 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 2 Apr 2018 18:27:33 +0200
-Subject: [PATCH] Fix build with automake 1.11+
-
-Initial patch from AlphatPC at gmail dot com.
-
-Due to a change in automake [1], pkglib_PROGRAMS is invalid and we must now
-use pkglibexec_PROGRAMS. Fix hardcoded location to gksu-run-helper to reflect
-this.
-
-[1] http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
-Gentoo-Bug-URL: https://bugs.gentoo.org/397411
-Gentoo-Bug-URL: https://bugs.gentoo.org/640772
-Project-Bug-URL: https://savannah.nongnu.org/bugs/index.php?35241
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-
----
- libgksu/Makefile.am | 5 ++---
- libgksu/libgksu.c   | 2 +-
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
-index 4a37305..3ddde5b 100644
---- a/libgksu/Makefile.am
-+++ b/libgksu/Makefile.am
-@@ -1,6 +1,6 @@
- AM_CFLAGS = -g -O2 -Wall
- INCLUDES = ${LIBGKSU_CFLAGS}
--AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
-+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" -DLIBEXECDIR=\"$(libexecdir)\"
- 
- lib_LTLIBRARIES = libgksu2.la
- libgksu2_la_SOURCES = libgksu.c libgksu.h
-@@ -22,8 +22,7 @@ includedir = ${prefix}/include/${PACKAGE}
- pkgconfigdir = ${libdir}/pkgconfig
- pkgconfig_DATA = libgksu2.pc
- 
--pkglibdir = ${libdir}/${PACKAGE}
--pkglib_PROGRAMS = gksu-run-helper
-+pkglibexec_PROGRAMS = gksu-run-helper
- gksu_run_helper_LDADD = ${GLIB_LIBS} 
- gksu_run_helper_SOURCES = gksu-run-helper.c
- 
-diff --git a/libgksu/libgksu.c b/libgksu/libgksu.c
-index 7203549..612e712 100644
---- a/libgksu/libgksu.c
-+++ b/libgksu/libgksu.c
-@@ -1937,7 +1937,7 @@ gksu_su_fuller (GksuContext *context,
-   GQuark gksu_quark;
-   int i = 0;
- 
--  gchar auxcommand[] = PREFIX "/lib/" PACKAGE "/gksu-run-helper";
-+  gchar auxcommand[] = LIBEXECDIR "/" PACKAGE "/gksu-run-helper";
- 
-   int fdpty;
-   pid_t pid;
--- 
-2.16.2
-
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch
deleted file mode 100644
index 0f22166fb8b7..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Due to the following change, pkglib_PROGRAMS is invalid:
-    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
-https://savannah.nongnu.org/bugs/index.php?35241
-https://bugs.gentoo.org/show_bug.cgi?id=397411
-
----
- libgksu/Makefile.am |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
-index 49362f9..3cb1090 100644
---- a/libgksu/Makefile.am
-+++ b/libgksu/Makefile.am
-@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
- pkgconfigdir = ${libdir}/pkgconfig
- pkgconfig_DATA = libgksu2.pc
- 
--pkglibdir = ${libdir}/${PACKAGE}
--pkglib_PROGRAMS = gksu-run-helper
-+gksulibdir = ${libdir}/${PACKAGE}
-+gksulib_PROGRAMS = gksu-run-helper
- gksu_run_helper_LDADD = ${GLIB_LIBS} 
- gksu_run_helper_SOURCES = gksu-run-helper.c
- 
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch b/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch
deleted file mode 100644
index 5c34cae56136..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'libgksu/libgksu.c'
---- a/libgksu/libgksu.c
-+++ b/libgksu/libgksu.c
-@@ -426,7 +426,7 @@
-   attr.height = fadeout->area.height;
-   attr.wclass = GDK_INPUT_OUTPUT;
-   attr.visual = gdk_screen_get_system_visual (fadeout->screen);
--  attr.colormap = gdk_screen_get_default_colormap (fadeout->screen);
-+  attr.colormap = gdk_screen_get_system_colormap (fadeout->screen);
-   attr.override_redirect = TRUE;
-   attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR;
- 
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch b/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch
deleted file mode 100644
index 15de910474b6..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix validation
-
---- a/gksu-properties/gksu-properties.desktop.in	2017-09-03 16:41:57.872594752 +0200
-+++ b/gksu-properties/gksu-properties.desktop.in	2017-09-03 16:44:40.835919489 +0200
-@@ -3,9 +3,9 @@
- _Name=Privilege granting
- _Comment=Configure behavior of the privilege-granting tool
- Exec=gksu-properties
--Icon=gksu.png
-+Icon=gksu
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;GTK;Application;Settings;AdvancedSettings;
-+Categories=GNOME;GTK;Settings;
- OnlyShowIn=GNOME;XFCE;
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
deleted file mode 100644
index 05ff3e0b0ad0..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix indentation of Makefile.am
-
---- a/Makefile.am	2010-08-22 16:11:19.872577459 -0500
-+++ b/Makefile.am	2010-08-22 16:11:55.289599110 -0500
-@@ -17,11 +17,11 @@
- 
- if GCONF_SCHEMAS_INSTALL
- install-data-local:
--        if test -z "$(DESTDIR)" ; then \
--          for p in $(schemas_DATA) ; do \
--            GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
--          done \
--        fi
-+	if test -z "$(DESTDIR)" ; then \
-+		for p in $(schemas_DATA) ; do \
-+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-+		done \
-+	fi
- else
- install-data-local:
- endif
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch b/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch
deleted file mode 100644
index d39bbafd67a3..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix build failure with [-Werror=format-security]
-Author: Michael Biebl <biebl@debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643423
-
-Let chunk stripped due to Gentoo revert-forkpty patch.
-
-Index: libgksu-2.0.13~pre1/libgksu/libgksu.c
-===================================================================
---- libgksu-2.0.13~pre1.orig/libgksu/libgksu.c	2011-12-07 11:01:18.351654566 +0100
-+++ libgksu-2.0.13~pre1/libgksu/libgksu.c	2011-12-07 11:01:41.231654725 +0100
-@@ -1276,7 +1276,7 @@
-   context->dir = g_strdup (mkdtemp(template));
-   if (!context->dir)
-     {
--      fprintf (stderr, strerror(errno));
-+      fprintf (stderr, "%s", strerror(errno));
-       return FALSE;
-     }
- 
-@@ -2247,7 +2247,7 @@
- 					  " %s"), converted_str, "gksu: waiting");
- 	      g_free (converted_str);
- 
--	      g_set_error (error, gksu_quark, GKSU_ERROR_HELPER, emsg);
-+	      g_set_error_literal (error, gksu_quark, GKSU_ERROR_HELPER, emsg);
- 	      g_free (emsg);
- 
- 	      if (context->debug)
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch b/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch
deleted file mode 100644
index de3ab6806eee..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Escape text for display in password prompt.
-
-From the Debian patch stack.
-
---- a/libgksu/libgksu.c
-+++ b/libgksu/libgksu.c
-@@ -994,12 +994,12 @@
- 				     "The application '%s' lets you "
- 				     "modify essential parts of your "
- 				     "system."),
--				   command);
-+				   g_markup_escape_text(command, -1));
- 	  else
- 	    msg = g_strdup_printf (_("<b><big>Enter your password to run "
- 				     "the application '%s' as user %s"
- 				     "</big></b>"),
--				   command, context->user);
-+				   g_markup_escape_text(command, -1), context->user);
- 	}
-       else
- 	{
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch b/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch
deleted file mode 100644
index 955f455b9f8a..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Add missing libs to relevant targets
-
---- a/configure.ac	2017-09-03 17:10:57.552216900 +0200
-+++ b/configure.ac	2017-09-03 17:16:39.674036975 +0200
-@@ -4,7 +4,7 @@
- AC_PREREQ(2.57)
- 
- AC_INIT(libgksu, 2.0.12, kov@debian.org)
--AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-+AM_INIT_AUTOMAKE([foreign])
- AC_CONFIG_SRCDIR(libgksu/libgksu.c)
- AC_CONFIG_HEADERS(config.h)
- 
-@@ -44,7 +44,7 @@
- PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.12, gconf-2.0])
- 
- PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
--PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0 x11])
- 
- # Checks for library functions.
- ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl th zh_CN"
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch
deleted file mode 100644
index 3787ef6bfc13..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: libgksu-2.0.12/libgksu/Makefile.am
-===================================================================
---- libgksu-2.0.12.orig/libgksu/Makefile.am
-+++ libgksu-2.0.12/libgksu/Makefile.am
-@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper
- gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
- gksu_run_helper_SOURCES = gksu-run-helper.c
- 
--noinst_PROGRAMS = test-gksu
-+EXTRA_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
- test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-Index: libgksu-2.0.12/libgksuui/Makefile.am
-===================================================================
---- libgksu-2.0.12.orig/libgksuui/Makefile.am
-+++ libgksu-2.0.12/libgksuui/Makefile.am
-@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- includedir = ${prefix}/include/$(PACKAGE)
- 
--noinst_PROGRAMS = test-gksuui
-+EXTRA_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
- test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch b/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch
deleted file mode 100644
index 2c3a8cc786bb..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
---- libgksu-2.0.12.orig/libgksu/libgksu.c	2009-06-29 13:48:24.000000000 -0400
-+++ libgksu-2.0.12/libgksu/libgksu.c	2010-01-12 07:32:10.450657456 -0500
-@@ -1,7 +1,6 @@
- /*
-  * Gksu -- a library providing access to su functionality
-  * Copyright (C) 2004-2009 Gustavo Noronha Silva
-- * Portions Copyright (C) 2009 VMware, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -56,9 +55,6 @@
- static void
- gksu_context_launch_complete (GksuContext *context);
- 
--static void
--read_line (int fd, gchar *buffer, int n);
--
- GType
- gksu_error_get_type (void)
- {
-@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
-       for (i = 0 ; cmd[i] != NULL ; i++)
- 	g_free (cmd[i]);
-       g_free(cmd);
--
--      _exit(1);
-     }
-   else if (pid == -1)
-     {
-@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
- 	  /* drop the \n echoed on password entry if su did request
- 	     a password */
- 	  if (password_needed)
--	    read_line (fdpty, buf, 255);
-+	    read (fdpty, buf, 255);
- 	  if (context->debug)
- 	    fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
--	  read_line (fdpty, buf, 255);
-+	  read (fdpty, buf, 255);
- 	  if (context->debug)
- 	    fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
- 	}
-@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
- 	{
- 	  int retval = 0;
- 
--	  /* Red Hat's su shows the full path to su in its error messages. */
--	  if (!strncmp (buf, "su:", 3) ||
--	      !strncmp (buf, "/bin/su:", 7))
-+	  if (!strncmp (buf, "su", 2))
- 	    {
- 	      gchar **strings;
- 
-@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
- 		}
- 
- 	      strings = g_strsplit (buf, ":", 2);
--
--	      /* Red Hat and Fedora use 'incorrect password'. */
--	      if (strings[1] &&
--	          (g_str_has_prefix(strings[1], " Authentication failure") ||
--	           g_str_has_prefix(strings[1], " incorrect password")))
-+	      if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
- 		{
- 		  if (used_gnome_keyring)
- 		    g_set_error (error, gksu_quark,
-@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
- {
-   char **cmd;
-   char buffer[256] = {0};
--  char *child_stderr = NULL;
--  /* This command is used to gain a token */
--  char *const verifycmd[] =
--    {
--      "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
--    };
-   int argcount = 8;
-   int i, j;
- 
-@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
- 
-   pid_t pid;
-   int status;
--  FILE *fdfile = NULL;
--  int fdpty = -1;
-+  FILE *infile, *outfile;
-+  int parent_pipe[2];	/* For talking to the parent */
-+  int child_pipe[2];	/* For talking to the child */
- 
-   context->sudo_mode = TRUE;
- 
-@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
-   cmd[argcount] = g_strdup("-S");
-   argcount++;
- 
--  /* Make sudo noninteractive (we should already have a token) */
--  cmd[argcount] = g_strdup("-n");
--  argcount++;
--
-   /* Make sudo use next arg as prompt */
-   cmd[argcount] = g_strdup("-p");
-   argcount++;
-@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
- 	fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
-     }
- 
--  pid = forkpty(&fdpty, NULL, NULL, NULL);
--  if (pid == 0)
-+  if ((pipe(parent_pipe)) == -1)
-     {
--      // Child
--      setsid();   // make us session leader
--
--      execv(verifycmd[0], verifycmd);
-+      g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+		   _("Error creating pipe: %s"),
-+		   strerror(errno));
-+      sudo_reset_xauth (context, xauth, xauth_env);
-+      return FALSE;
-+    }
- 
--      g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
--		   _("Failed to exec new process: %s"),
-+  if ((pipe(child_pipe)) == -1)
-+    {
-+      g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+		   _("Error creating pipe: %s"),
- 		   strerror(errno));
-       sudo_reset_xauth (context, xauth, xauth_env);
-       return FALSE;
-     }
--  else if (pid == -1)
-+
-+  pid = fork();
-+  if (pid == -1)
-     {
-       g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
- 		   _("Failed to fork new process: %s"),
-@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
-       sudo_reset_xauth (context, xauth, xauth_env);
-       return FALSE;
-     }
-+  else if (pid == 0)
-+    {
-+      // Child
-+      setsid();   // make us session leader
-+      close(child_pipe[1]);
-+      dup2(child_pipe[0], STDIN_FILENO);
-+      dup2(parent_pipe[1], STDERR_FILENO);
- 
-+      execv(cmd[0], cmd);
-+
-+      g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
-+		   _("Failed to exec new process: %s"),
-+		   strerror(errno));
-+      sudo_reset_xauth (context, xauth, xauth_env);
-+      return FALSE;
-+    }
-   else
-     {
-       gint counter = 0;
-       gchar *cmdline = NULL;
--      struct termios tio;
- 
-       // Parent
--      fdfile = fdopen(fdpty, "w+");
-+      close(parent_pipe[1]);
- 
--      /* make sure we notice that ECHO is turned off, if it gets
--         turned off */
--      tcgetattr (fdpty, &tio);
--      for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
--      {
--        usleep (1000);
--        tcgetattr (fdpty, &tio);
--      }
-+      infile = fdopen(parent_pipe[0], "r");
-+      if (!infile)
-+	{
-+	  g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+		       _("Error opening pipe: %s"),
-+		       strerror(errno));
-+	  sudo_reset_xauth (context, xauth, xauth_env);
-+	  return FALSE;
-+	}
- 
--      fcntl (fdpty, F_SETFL, O_NONBLOCK);
-+      outfile = fdopen(child_pipe[1], "w");
-+      if (!outfile)
-+	{
-+	  g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+		       _("Error opening pipe: %s"),
-+		       strerror(errno));
-+	  sudo_reset_xauth (context, xauth, xauth_env);
-+	  return FALSE;
-+	}
-+
-+      /*
-+	we are expecting to receive a GNOME_SUDO_PASS
-+	if we don't there are two possibilities: an error
-+	or a password is not needed
-+      */
-+      fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
- 
-       { /* no matter if we can read, since we're using
- 	   O_NONBLOCK; this is just to avoid the prompt
-@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
- 	struct timeval tv;
- 
- 	FD_ZERO(&rfds);
--	FD_SET(fdpty, &rfds);
-+	FD_SET(parent_pipe[0], &rfds);
- 	tv.tv_sec = 1;
- 	tv.tv_usec = 0;
- 
--	select (fdpty + 1, &rfds, NULL, NULL, &tv);
-+	select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
-       }
- 
-       /* Try hard to find the prompt; it may happen that we're
-@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
- 	  if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
- 	    break;
- 
--	  read_line (fdpty, buffer, 256);
-+	  read_line (parent_pipe[0], buffer, 256);
- 
- 	  if (context->debug)
- 	    fprintf (stderr, "buffer: -%s-\n", buffer);
-@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
- 
- 	  usleep (1000);
- 
--	  write (fdpty, password, strlen(password) + 1);
--	  write (fdpty, "\n", 1);
-+	  fprintf (outfile, "%s\n", password);
-+	  fclose (outfile);
- 
- 	  nullify_password (password);
- 
--	  fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
-+	  /* turn NONBLOCK off */
-+	  fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
- 	  /* ignore the first newline that comes right after sudo receives
- 	     the password */
--	  fgets (buffer, 255, fdfile);
--	  /* this is the status we are interested in */
--	  fgets (buffer, 255, fdfile);
-+	  fgets (buffer, 255, infile);
-+	  /* this is the status we are interessted in */
-+	  fgets (buffer, 255, infile);
- 	}
-       else
- 	{
-@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
- 	    fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
- 
-           /* turn NONBLOCK off, also if have no prompt */
--          fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
-+          fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
- 
- 	  should_display = gconf_client_get_bool (context->gconf_client,
- 						  BASE_PATH "display-no-pass-info", NULL);
-@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
- 	  fprintf (stderr, "%s", buffer);
- 	}
- 
--      if (g_str_has_prefix (buffer, "Sorry, try again."))
-+      if (!strcmp (buffer, "Sorry, try again.\n"))
- 	g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
- 		     _("Wrong password."));
-+      else if (!strncmp (buffer, "Sorry, user ", 12))
-+	g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
-+		     _("The underlying authorization mechanism (sudo) "
-+		       "does not allow you to run this program. Contact "
-+		       "the system administrator."));
-       else
- 	{
- 	  gchar *haystack = buffer;
-@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
- 	    }
- 	}
- 
--      /* If we have an error, let's just stop sudo right there. */
--      if (error)
--        close(fdpty);
--
-       cmdline = g_strdup("sudo");
-       /* wait for the child process to end or become something other
- 	 than sudo */
-@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
-       if (context->sn_context)
- 	gksu_context_launch_complete (context);
- 
-+      while (read (parent_pipe[0], buffer, 255) > 0)
-+	{
-+	  fprintf (stderr, "%s", buffer);
-+	  bzero(buffer, 256);
-+	}
-+
-       /* if the process is still active waitpid() on it */
-       if (pid_exited != pid)
- 	waitpid(pid, &status, 0);
-       sudo_reset_xauth (context, xauth, xauth_env);
- 
--      /*
--       * Did token acquisition succeed? If so, spawn sudo in
--       * non-interactive mode. It should either succeed or die
--       * immediately if you're not allowed to run the command.
--       */
--      if (WEXITSTATUS(status) == 0)
--        {
--          g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
--                       NULL, &child_stderr, &status,
--                       error);
--        }
--
-       if (exit_status)
-       {
-       	if (WIFEXITED(status)) {
-@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
- 
-       if (WEXITSTATUS(status))
- 	{
--          if (g_str_has_prefix(child_stderr, "Sorry, user "))
--            {
--              g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
--                           _("The underlying authorization mechanism (sudo) "
--                             "does not allow you to run this program. Contact "
--                             "the system administrator."));
--            }
- 	  if(cmdline)
- 	    {
- 	      /* sudo already exec()ed something else, don't report
-@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
- 	      if (!g_str_has_suffix (cmdline, "sudo"))
- 		{
- 		  g_free (cmdline);
--		  g_free (child_stderr);
- 		  return FALSE;
- 		}
- 	      g_free (cmdline);
-@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
- 	}
-     }
- 
--  fprintf(stderr, child_stderr);
--  g_free(child_stderr);
--
-   /* if error is set we have found an error condition */
--  return (error == NULL);
-+  if (error)
-+    return FALSE;
-+
-+  return TRUE;
- }
- 
- /**
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch b/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch
deleted file mode 100644
index a51a1623debb..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/libgksu/libgksu.c
-+++ b/libgksu/libgksu.c
-@@ -2704,6 +2704,12 @@
-       cmd[argcount] = g_strdup("-H");
-       argcount++;
-     }
-+  else
-+    {
-+      /* Preserve the environment, if sudo will let us */
-+      cmd[argcount] = g_strdup("-E");
-+      argcount++;
-+    }
- 
-   /* Make sudo read from stdin */
-   cmd[argcount] = g_strdup("-S");
diff --git a/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch b/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch
deleted file mode 100644
index b9fb77f27147..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-# https://savannah.nongnu.org/bugs/?25362
-# https://bugs.gentoo.org/show_bug.cgi?id=226837
-diff -Nura a/configure.ac b/configure.ac
---- a/configure.ac	2009-01-19 22:15:30.000000000 +0100
-+++ b/configure.ac	2009-01-19 22:18:10.000000000 +0100
-@@ -43,6 +43,9 @@
- PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
- PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0])
- 
-+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
-+
- # Checks for library functions.
- ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN"
- 
-diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am
---- a/gksu-properties/Makefile.am	2009-01-19 22:15:59.000000000 +0100
-+++ b/gksu-properties/Makefile.am	2009-01-19 22:19:13.000000000 +0100
-@@ -3,7 +3,7 @@
- AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
- 
- bin_PROGRAMS = gksu-properties
--gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
-+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS}
- gksu_properties_SOURCES = gksu-properties.c
- 
- gladedir = ${prefix}/share/${PACKAGE}
-diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am
---- a/libgksu/Makefile.am	2009-01-19 22:15:59.000000000 +0100
-+++ b/libgksu/Makefile.am	2009-01-19 22:18:25.000000000 +0100
-@@ -8,8 +8,8 @@
- # major -> breaks backward compatibility (changes to existing ABI)
- # minor -> keeps compatibility (additions to the API)
- # micro -> no change to the API/ABI
--libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
--libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
- if USE_VERSION_SCRIPT
- libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
- endif
-@@ -24,12 +24,11 @@
- 
- pkglibdir = ${libdir}/${PACKAGE}
- pkglib_PROGRAMS = gksu-run-helper
--gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
-+gksu_run_helper_LDADD = ${GLIB_LIBS} 
- gksu_run_helper_SOURCES = gksu-run-helper.c
- 
- noinst_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
--test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS}
- 
- EXTRA_DIST = libgksu.ver
-diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am
---- a/libgksuui/Makefile.am	2009-01-19 22:15:59.000000000 +0100
-+++ b/libgksuui/Makefile.am	2009-01-19 22:18:54.000000000 +0100
-@@ -4,12 +4,13 @@
- 
- noinst_LTLIBRARIES = libgksuui1.0.la
- libgksuui1_0_la_SOURCES = gksuui-dialog.c
--libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
-+libgksuui1_0_la_LDFLAGS = -Wl,-O1
-+libgksuui1_0_la_LIBADD = ${GTK_LIBS}
- 
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- includedir = ${prefix}/include/$(PACKAGE)
- 
- noinst_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
--test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS}
-+
diff --git a/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch b/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch
deleted file mode 100644
index 753862955716..000000000000
--- a/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# https://savannah.nongnu.org/bugs/?25360
-diff -Nura a/configure.ac b/configure.ac
---- a/configure.ac	2009-01-19 21:50:57.000000000 +0100
-+++ b/configure.ac	2009-01-19 21:53:21.000000000 +0100
-@@ -50,7 +50,7 @@
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
- AC_SUBST(GETTEXT_PACKAGE)
- 
--IT_PROG_INTLTOOL
-+IT_PROG_INTLTOOL([0.35.5])
- AM_GLIB_GNU_GETTEXT
- 
- ##################################################
-diff -Nura a/po/LINGUAS b/po/LINGUAS
---- a/po/LINGUAS	1970-01-01 01:00:00.000000000 +0100
-+++ b/po/LINGUAS	2009-01-19 21:54:24.000000000 +0100
-@@ -0,0 +1,23 @@
-+# please keep this list sorted alphabetically
-+# https://wiki.gnome.org/Initiatives/GnomeGoals/PoLinguas
-+#
-+ca
-+cs
-+da
-+de
-+es
-+eu
-+fr
-+hu
-+it
-+ko
-+lt
-+pl
-+pt_BR
-+ro
-+ru
-+sk
-+sv
-+nb
-+nl
-+zh_CN
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
deleted file mode 100644
index b3efe9f71e4b..000000000000
--- a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library for integration of su into applications"
-HOMEPAGE="http://www.nongnu.org/gksu/"
-SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="nls static-libs"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/libX11
-	>=gnome-base/gconf-2
-	gnome-base/libgnome-keyring
-	x11-libs/startup-notification
-	>=gnome-base/libgtop-2:2=
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-"
-
-PATCHES=(
-	# Fix compilation on bsd
-	"${FILESDIR}"/${PN}-2.0.0-fbsd.patch
-
-	# Fix wrong usage of LDFLAGS, bug #226837
-	"${FILESDIR}"/${PN}-2.0.7-libs.patch
-
-	# Use po/LINGUAS
-	"${FILESDIR}"/${PN}-2.0.7-polinguas.patch
-
-	# Don't forkpty; bug #298289
-	"${FILESDIR}"/${P}-revert-forkpty.patch
-
-	# Make this gmake-3.82 compliant, bug #333961
-	"${FILESDIR}"/${P}-fix-make-3.82.patch
-
-	# Do not build test programs that are never executed; also fixes bug
-	# #367397 (underlinking issues).
-	"${FILESDIR}"/${P}-notests.patch
-
-	# Fix automake-1.11.2 compatibility, bug #397411
-	"${FILESDIR}"/${P}-automake-1.11.2.patch
-	"${FILESDIR}"/${P}-missing-libs.patch
-
-	# Fix build with format-security, bug #517614
-	"${FILESDIR}"/${P}-format_security.patch
-
-	# Fix .desktop file validation, bug #512364
-	"${FILESDIR}"/${P}-desktop-validation.patch
-
-	# Collection of patches from Debian
-	"${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch
-	"${FILESDIR}"/${P}-sudo_keep_env.patch
-	"${FILESDIR}"/${P}-correct_colormap_get.patch
-)
-
-src_prepare() {
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
deleted file mode 100644
index 2db92390db5d..000000000000
--- a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library for integration of su into applications"
-HOMEPAGE="http://www.nongnu.org/gksu/"
-SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="nls static-libs"
-
-COMMON_DEPEND="
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/libX11
-	>=gnome-base/gconf-2
-	gnome-base/libgnome-keyring
-	x11-libs/startup-notification
-	>=gnome-base/libgtop-2:2=
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-"
-
-PATCHES=(
-	# Fix compilation on bsd
-	"${FILESDIR}"/${PN}-2.0.0-fbsd.patch
-
-	# Fix wrong usage of LDFLAGS, bug #226837
-	"${FILESDIR}"/${PN}-2.0.7-libs.patch
-
-	# Use po/LINGUAS
-	"${FILESDIR}"/${PN}-2.0.7-polinguas.patch
-
-	# Don't forkpty; bug #298289
-	"${FILESDIR}"/${P}-revert-forkpty.patch
-
-	# Make this gmake-3.82 compliant, bug #333961
-	"${FILESDIR}"/${P}-fix-make-3.82.patch
-
-	# Do not build test programs that are never executed; also fixes bug
-	# #367397 (underlinking issues).
-	"${FILESDIR}"/${P}-notests.patch
-
-	# Fix automake-1.11.2 compatibility, bug #397411
-	# Fix gksu-run-helper path, bug #640772
-	"${FILESDIR}"/${P}-automake-1.11.2-v2.patch
-	"${FILESDIR}"/${P}-missing-libs.patch
-
-	# Fix build with format-security, bug #517614
-	"${FILESDIR}"/${P}-format_security.patch
-
-	# Fix .desktop file validation, bug #512364
-	"${FILESDIR}"/${P}-desktop-validation.patch
-
-	# Collection of patches from Debian
-	"${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch
-	"${FILESDIR}"/${P}-sudo_keep_env.patch
-	"${FILESDIR}"/${P}-correct_colormap_get.patch
-)
-
-src_prepare() {
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
diff --git a/x11-libs/libgksu/metadata.xml b/x11-libs/libgksu/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/x11-libs/libgksu/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/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index cb756a260540..77bd3d79f4ab 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -3,5 +3,5 @@ DIST libwnck-3.24.1.tar.xz 821508 BLAKE2B 18bc01a08107e0b2b040cb6036a80cb289955a
 DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128
 EBUILD libwnck-2.31.0.ebuild 1277 BLAKE2B 521bf8ecde7f1c5907a6c82fa76c6262aa01b1dc0d47c61d58a36b8738fc95c8cc953c25d3f181cebbcfe565b9ea2d03c650e741c9f67f7f8cdb78d6e7681716 SHA512 df4fb078670c4ccafac707d6987a1a681cd2b3e6567b093b6ecdf7550d9bd097852738502757347fc761f3d6488d261625b91204b6228b73410a6114efad8779
 EBUILD libwnck-3.24.1.ebuild 1155 BLAKE2B bf5a92d122bceea6c1a781a5fe882abd4cf68186ea1c2fb6d261480a94fbcd10db6d288e4c92c6834ac7ce103246ef90802cce1efa46a0aba0d940321cbc7841 SHA512 202d37dcaeeb54994965ad51de9c3b9b193b9f295af116a258e711e022c09a403f3e45f51c0bc3ef62e7e64c6912cb235a9fd7a0428d3ade6499efc005ebe8c1
-EBUILD libwnck-3.30.0.ebuild 1159 BLAKE2B bacda6b18871550e1c00faa741bbc9e959a2f6edd7f81f1c1e8b92d85e6b1409746ea6509d9622a84455d221423c8fda8cba2fd3cacd2e627a9f3c3ce4acbed8 SHA512 4ab3900bd1279d9d8c030d114f849ad92f67a148430ffb0ad0cc538a2200892c34122a6f405201caf01f625a854a39fc69280880cca01efb96a0b4015ef41033
+EBUILD libwnck-3.30.0.ebuild 1153 BLAKE2B 21927814dfedad7f5a5c1e87f05c4205edc30a9da71c0a4f67b46dd1add4351ba55ebbc366a431bf007cc7a2b3b2ecfad3af3451942cf6b73a694f0b51f71a03 SHA512 b386afccf0bbae8de3aef0168bf85a309a9828ed559b2abe5aeef06d01d02501fe6a46431dbcc4d67c02b55a94e6a15d4e03af5189ffc16c6fc7f111f58a9695
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-3.30.0.ebuild b/x11-libs/libwnck/libwnck-3.30.0.ebuild
index 286228ef148a..c47fe9fe0a62 100644
--- a/x11-libs/libwnck/libwnck-3.30.0.ebuild
+++ b/x11-libs/libwnck/libwnck-3.30.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index b511e7d5aef3..f480b57e25bf 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,6 @@
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-EBUILD pango-1.40.14-r1.ebuild 1662 BLAKE2B e367786214b081a64fa9036f06ed205200ee2a2ff110d269efd5eb0d3fab3d3ec401d327369a901c415aa6aa93ccdfcd740f729f2fbc6a361c50e2f8fbb5067b SHA512 be9bc00dcb297db2b0d367640ced582685c2aa452ad129b6bdfb9426183b634c094cc985a91309c82e003f23ff9f5714292e54f67d3e5874596f2ec0f7014550
-EBUILD pango-1.42.4.ebuild 2009 BLAKE2B eaadc286b54ad8bff1a3020c68704b2d9728de6aa724f81c5dd27b912a50cb987822675d3585f2f625836ff3d1cb75e7c2c70de5b11f057929eb47f70a52f04c SHA512 e93320e72ae73d66e98ce486e50779bde7df9d6d4e09cc940caf785930051ed7900fc6ded95eff3615307cc50f90092ff398f7afa2f779365b529def15599315
+EBUILD pango-1.40.14-r1.ebuild 1680 BLAKE2B 3232426804fbbff57e8b7071cea928e241873cb25fa444b8aa412e5ee6b11141d46f68d843f3e764b85ac5b93b0f4d72983e18660590dafd4fac962093d52e52 SHA512 e4c34fd5ce181a3fa04021736763c11c152e31dda71cca14d176cba2b9816d64f3adce6ac3583e957e987fa1849eca4166ad8abbbd35d03529a33073f18828b8
+EBUILD pango-1.42.4.ebuild 2029 BLAKE2B f1823f31b9a0fd8f703bb35d6fcc121f9903842e5940bbfb8b63655c9b8cc97f0d5caa8ee75bd8199ae7e6eeb97f7ed2b23cffa20387d846def43cd349532b21 SHA512 cd2730fd158dc06a7e35b20e5178546a4ab3cc0000e5b0c78a151a05175280885778f9e3322e317499d4b4bbefce62a83c8abfb37841be0b286b97058b45a056
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.14-r1.ebuild b/x11-libs/pango/pango-1.40.14-r1.ebuild
index 91243e67b181..3ea1420d6682 100644
--- a/x11-libs/pango/pango-1.40.14-r1.ebuild
+++ b/x11-libs/pango/pango-1.40.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( media-fonts/cantarell )
diff --git a/x11-libs/pango/pango-1.42.4.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
index 7468d1e335da..4d2a47422610 100644
--- a/x11-libs/pango/pango-1.42.4.ebuild
+++ b/x11-libs/pango/pango-1.42.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
@@ -30,6 +30,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( media-fonts/cantarell )
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index e231811e1bbe..d49f53202ca7 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,6 @@
 DIST pixman-0.34.0.tar.bz2 739656 BLAKE2B 8e235ec6332125046ac952c32bb3d6d2adabae01f121a952f62aed66470c367f31268f7fc5d4387db5e3a6145cde4f013871f2d82d2d8765e5a41cb8247d4761 SHA512 755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418
+DIST pixman-0.36.0.tar.bz2 739957 BLAKE2B 05834dbed8a5bfed607a20f78523e7441f5b78a7a01c7d302c48b8f15dcda37111a8a99e7119b84a0a8a26b55fa93db1c2af316359095cb7db0d8a9e263a1eb7 SHA512 ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21
 EBUILD pixman-0.34.0.ebuild 1009 BLAKE2B 8aac848a14d111e598f4ff5f8345658cfd54e8d155b97f367b8b55a133f60032500a2782b651ecfac2be84cd9ffc36d8bb7bb0a2be3e32abf02d9fd999968759 SHA512 fed8c4bb8983ad4d484099c1872b759383781633b834f560299e37a9eadc84a13352b414f18cd1827ef30e9da9fba38201368fc3481d30758304923dedf11e41
+EBUILD pixman-0.36.0.ebuild 1022 BLAKE2B c8e833fdc07b1f591eae4bea4187bbdc32a8a5babc687e82225ca828055d278e797dd9334b6095ff5d22fa6230bb1229c1c3ee2c4404a4327e46b8533a266577 SHA512 5f8978abca39575364a0f4110e263d99dfffe266319ea6b89c835fe952c371ea4d477b01b520023c893d2ccf3a998017120ea89469c5a0d93e3014adde8c5ce7
 EBUILD pixman-9999.ebuild 1022 BLAKE2B 1876024bdba963fdc1f8fd2226099d75b8a4ef5c7918ef4967bc7ea24aa4dc59a08fc6d81acde1778308043a9f9fddb6b494607f265fad6b75ae2889142eb85c SHA512 ec76a5f65932b57d0d76f841a152646edeea44a3f2d3e8bdd4d078ba7de36b7ed264b0ee7221eb64c27206409e8ce66d7dc01c56d50e5214f55da267d1b7b08c
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.36.0.ebuild b/x11-libs/pixman/pixman-0.36.0.ebuild
new file mode 100644
index 000000000000..3b905898e57f
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.36.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
+DESCRIPTION="Low-level pixel manipulation routines"
+
+if [[ $PV != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+IUSE="altivec loongson2f cpu_flags_arm_iwmmxt cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable cpu_flags_arm_iwmmxt arm-iwmmxt)
+		$(use_enable cpu_flags_x86_mmxext mmx)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		$(use_enable loongson2f loongson-mmi)
+		--disable-gtk
+		--disable-libpng
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 74c88a89cbf2..819ddbbcb1f7 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,7 +1,5 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
-DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
 EBUILD qscintilla-2.10.4.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
-EBUILD qscintilla-2.10.7.ebuild 1802 BLAKE2B 54a078d16a981c7f5ca4b332592e388376caa4201f02867464dda62e2fda08b0f9e3a5535558367198931a67c657161b20e93b3982c62f83c92fbc308950c32d SHA512 d304e9df12f1915e24890bfe02e8019d6a9cdc660deb65467aa17c36979ce2947a615d09cc82d532b75e1b42c54cf4f18b48791b10787e1bf834d2096a1cb6a8
 EBUILD qscintilla-2.10.8.ebuild 1799 BLAKE2B 7674060f252519b516ce8ec1530eef5f943381b0f1ba3bb19bb450f035f040c624fdac411e5d82040b0aa76c5144135b82994e74c91a878dfeea4fa6620465b9 SHA512 c1af6dc28219da9fd43fbd9df0d4d2bb25402cf8f9865e16bcbda52a2b3c38c8717c363ae8e50748982b05160ea1cdb4868eacb6c9ae7bcc9599529b3a0e923f
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.7.ebuild b/x11-libs/qscintilla/qscintilla-2.10.7.ebuild
deleted file mode 100644
index aa76e891b48e..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="designer doc"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	default
-
-	# Sub-slot sanity check
-	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
-	local major=${version%%.*}
-	if [[ ${subslot} != ${major} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-	fi
-
-	qsci_run_in Qt4Qt5 eqmake5
-	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
-}
-
-src_compile() {
-	qsci_run_in Qt4Qt5 emake
-	use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
-	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
-	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
-	DOCS=( ChangeLog NEWS )
-	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
-	einstalldocs
-}
diff --git a/x11-libs/spread-sheet-widget/Manifest b/x11-libs/spread-sheet-widget/Manifest
new file mode 100644
index 000000000000..ce4a88f76ab8
--- /dev/null
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -0,0 +1,3 @@
+DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeacccce169a6f53d9f7f418f5e8469744fb19b SHA512 1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
+EBUILD spread-sheet-widget-0.3.ebuild 355 BLAKE2B 73a81f69dfec4052cdb2b8e9b10fc5409effbc8e8976a9d728c811495865dc19ccb666989a7d61067bdd8e3ed7d3aeda2315381f11877d775b22a7a157bd9ae4 SHA512 84fa20d6f46a961f997fbc6ec578794be15906ff9dcb3fa9bc5337dd5593e583fcf98d389726725a14ca45c2b00d5b06a2c179c7a1fc89cf098825122e15d56e
+MISC metadata.xml 783 BLAKE2B 352fc49d73a0037151ccb02d9d14d03a9f71eddbdf1add8e7b805cf398fbe7dae6d7a6bd985ef84bc34092f0fa4fb525d6cc4ad39f76cfb5944cf9897b68568f SHA512 9bc392c1064f078db2e1356c0736db3660339f81d20dbfa9039f01f0e8907c660285ed5a8c98b62feafe2e902351d52bdc2bc2c6538c5f7c1c8e79cf08e5df83
diff --git a/x11-libs/spread-sheet-widget/metadata.xml b/x11-libs/spread-sheet-widget/metadata.xml
new file mode 100644
index 000000000000..7bd5a01cbd2a
--- /dev/null
+++ b/x11-libs/spread-sheet-widget/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<longdescription>
+		GNU Spread Sheet Widget is a library for Gtk+ which provides a widget for viewing and manipulating 2 dimensional tabular data in a manner similar to many popular spread sheet programs.
+		The design follows the model-view-controller paradigm and is of complexity O(1) in both time and space. This means that it is efficient and fast even for very large data.
+		Features commonly found in graphical user interfaces such as cut and paste, drag and drop and row/column labelling are also included.
+	</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild
new file mode 100644
index 000000000000..27727130ea32
--- /dev/null
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU Spread Sheet Widget"
+HOMEPAGE="https://www.gnu.org/software/ssw/"
+SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/gtk+:3"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 59242e1702e0..da80a531d5de 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,13 +3,11 @@ AUX vte-0.28.2-limit-arguments.patch 1477 BLAKE2B 329e8eb93156244526ebe3ccb3c2a7
 AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f20415193bf9bc283399bcae4e3c2a23ff7f2f8ffee08e8a67c3af2956b137f788322e26bf2537e785c0d0ce6266b56269abe5a18e2e881ea548b5c1b4625 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec
 AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-DIST vte-0.36.5.tar.xz 1017504 BLAKE2B a7a94b389660f9bbf7aa8033e4a5e2cc96c39458e43960ad2ce785f2fbe1597c7156d090aab220e909ae31f8731d0d961686dce08aef0f270581c01de4bf19b0 SHA512 43f9211381238ca6cb7f49c8a9dd8f48f702e9968e038fa26ee69228c1fc86061d5dbfabb2c27f677280e89ae9080f20594f3c27481246e3f91dd5f3ea0354f6
 DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b173fece305af35f51b20f9d4811b33265b5a6eb83441e0b978539de501d118a8431c4a9a9a69a111a03c45adc87763b15b09fd2 SHA512 b8ba202aedb5d821962a7cdc89e6ef8ac8a3480dd7681bf8ce708ce511598f3335ba153750d40cb06e9a2c5bab5888b3daef9096458c2889d94028feaa394575
 DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.54.1.tar.xz 1083552 BLAKE2B 1e52275c953b5fbf51a1cc727dfca0bde3cc8f51a18055cd0c65c949479d0b4d926466016fa7d6f6dbebc9117c1b6fbde9a4bde38c5d82bb44ecce8612290de6 SHA512 5cb866e75c35e1b5728d17b0433641ceb4837495d59185a04fde9dd8c9849ab905a6b2718a50b27cc70323c7a6c5db31a808816576c30d7f18ece889a329fb61
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
-EBUILD vte-0.36.5.ebuild 1684 BLAKE2B 8e5a971eaeb84f198cda7ef9a853c1917dfe646002e5206652d3447881e7d30ad3f47bdc6131e671dc6175c9c86cede3ce7c537c3e5b912526faa549fd22c993 SHA512 f776c181fbea6dd5c27e6d9a4c8ca55859fae513ef3fb6fc7a98db638c61a5df4a45770e18c032ec191a652365a1840e1f8834b485c559e7e5f82022f7447af6
 EBUILD vte-0.48.4.ebuild 2311 BLAKE2B ab8a4a1113f242af86b006aa1030c7225df44639b3e1c4247b8f66584bbaf9b62db42969ca60d5b39df62da3c508aee1760f7c7023c033365d09fa6ef1796705 SHA512 0af0a71e7796cc2dfc60390800e8d8b8e3184533fdc0e091cd3567fb0496b38668d96c63548066d1f5ba5246de530570ea24157d07ffd9be8c6b367640fa94e5
 EBUILD vte-0.54.1.ebuild 2219 BLAKE2B 848523f5a310b0356c6475cfc7490220599a461a9ad2e545a9c917dc95bb2484f12756132a48e2c591005d738d865fc6cada08b2d624adc536b6f255810ff3ff SHA512 3a09c4180e067b24f9ac7a84f695ea71fe124cc27ce2124254cb3e8e743fe953b3185cc4ec733f61531a1f2084930a8cc09dc70579c26131ed3f1e2f0f501b04
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.36.5.ebuild b/x11-libs/vte/vte-0.36.5.ebuild
deleted file mode 100644
index 0320ed9f709c..000000000000
--- a/x11-libs/vte/vte-0.36.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.90"
-IUSE="debug glade +introspection"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
-RDEPEND="
-	>=dev-libs/glib-2.31.13:2
-	>=x11-libs/gtk+-3.1.9:3[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	x11-libs/libX11
-	x11-libs/libXft
-
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
-	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	# Python bindings are via gobject-introspection
-	# Ex: from gi.repository import Vte
-	# Do not disable gnome-pty-helper, bug #401389
-	gnome2_src_configure \
-		--disable-deprecation \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalogue) \
-		$(use_enable introspection) \
-		${myconf}
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_install
-	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
-}
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 9c27870a90c4..3d22a06f1d2f 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,3 +1,5 @@
 DIST xapps-1.0.4.tar.gz 129497 BLAKE2B d668ff840fa83b4a037c4b0f1c502e1851236d7998c4e5c7161a779e170eee6f6f47a2a17e71f332edf3f42f6ccb88c20379ad3b12847277f5e57a3b3765f2ef SHA512 1b735167f8edf15be1093255691c67ee1ae99664a714b75d46b1b782b00a6d1da72befc484ee66f070a829b6b8fd4dfa50bec5033220f66a1a4b577363b673b7
+DIST xapps-1.4.2.tar.gz 69709 BLAKE2B 514e4cb2e614ccd9fa303625eb5ffb818847447b29d6d989c2abdc90b6b9840dac6124d8484b71ffc2e489a925f83dae597c0904aa79cd5d5a0c27d44420da96 SHA512 2d16bd893a16876270c41d755c62ca454f561931750acc719c480e63036b70dca8dae25e6a313f13ed0daae09fd650e0efcef9d272c405ccd9c04147aaf59fe2
 EBUILD xapps-1.0.4.ebuild 1186 BLAKE2B e207f0937b415d8c2adb357c4b170e3e1613c4859a82f1b8bc488caa9370343dae1be41352d02ab8b729fafd4934a9c488d1236792af9db4b953b86e7249e29f SHA512 e70d855da7293f8aefd5bdf10f0d43e7cd489d34852333b391a485d03a10006d8d6840562c13e72992370b6f617c55cc431df00bc2a94211e105af2ac5bd0948
+EBUILD xapps-1.4.2.ebuild 1162 BLAKE2B 74cf5ac221e9f78580329fe0fb0465c649e86d570989598c185e6f21a8e7369f3e914390f371112e4049b784e94922c8cbf65893a07295cc7c5335ecfa8fd7b6 SHA512 1f9b66dd772ce02095a3054888922ef03c25ed183f2e42778831ed365dfbef1d18a9d197594fc3b8a2cd739d246b72195dd43d577fce0120e6100ca1461f085a
 MISC metadata.xml 332 BLAKE2B 63c6409ca74c859140b77f0075049a181a636bf7179d4d6f5ca508740ae75009d9dcd4472e33bde6c66033400670f5a730ffc975d30d798a865c6e1228686892 SHA512 fe3c09b76536049881c6c9de9c0ebe702a7fc29400649eb5f4b7d26a4642a08ff07bb69bb4020aa552c594ee5942bbf5e6c2df9a7754f485a97c5f5bfd6d8aa2
diff --git a/x11-libs/xapps/xapps-1.4.2.ebuild b/x11-libs/xapps/xapps-1.4.2.ebuild
new file mode 100644
index 000000000000..b5abeaa603a8
--- /dev/null
+++ b/x11-libs/xapps/xapps-1.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_USE_DEPEND="vapigen"
+inherit vala meson gnome2-utils xdg-utils
+
+DESCRIPTION="Cross-desktop libraries and common resources"
+HOMEPAGE="https://github.com/linuxmint/xapps/"
+LICENSE="GPL-3"
+
+SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+IUSE="introspection static-libs"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	dev-libs/gobject-introspection:0=
+	gnome-base/libgnomekbd
+	gnome-base/gnome-common
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	x11-libs/libxkbfile
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	$(vala_depend)
+"
+
+src_prepare() {
+	xdg_environment_reset
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	meson_src_configure \
+		-Dwith-docs=true
+}
+
+src_install() {
+	meson_src_install
+	rm -rf "${ED%/}"/usr/bin || die
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /x11-libs
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)