[gentoo-commits] repo/gentoo:master commit in: x11-libs/libgksu/, profiles/, x11-libs/libgksu/files/

[Michał Górny]

commit:     7f480aa65b18043d59ebd3742ea8927a90f786d5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 14:00:51 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 14:00:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f480aa6

x11-libs/libgksu: Remove last-rited pkg

Closes: https://bugs.gentoo.org/425156
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 profiles/package.mask                              |   5 -
 x11-libs/libgksu/Manifest                          |   1 -
 x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch    |  60 ----
 .../files/libgksu-2.0.12-automake-1.11.2-v2.patch  |  61 ----
 .../files/libgksu-2.0.12-automake-1.11.2.patch     |  25 --
 .../libgksu-2.0.12-correct_colormap_get.patch      |  12 -
 .../files/libgksu-2.0.12-desktop-validation.patch  |  16 -
 .../files/libgksu-2.0.12-fix-make-3.82.patch       |  21 --
 .../files/libgksu-2.0.12-format_security.patch     |  28 --
 ...u-2.0.12-g_markup_escape_text_for_command.patch |  21 --
 .../files/libgksu-2.0.12-missing-libs.patch        |  22 --
 .../libgksu/files/libgksu-2.0.12-notests.patch     |  26 --
 .../files/libgksu-2.0.12-revert-forkpty.patch      | 359 ---------------------
 .../files/libgksu-2.0.12-sudo_keep_env.patch       |  15 -
 x11-libs/libgksu/files/libgksu-2.0.7-libs.patch    |  76 -----
 .../libgksu/files/libgksu-2.0.7-polinguas.patch    |  40 ---
 x11-libs/libgksu/libgksu-2.0.12-r3.ebuild          |  81 -----
 x11-libs/libgksu/libgksu-2.0.12-r4.ebuild          |  82 -----
 x11-libs/libgksu/metadata.xml                      |   8 -
 19 files changed, 959 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index eab01cdd080..1a31b37edcc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -143,11 +143,6 @@ dev-ruby/ragol
 dev-ruby/webmock:0
 dev-ruby/wikicloth
 
-# Pacho Ramos <pacho@g.o> (11 Nov 2018)
-# Dead for years (#425156) with security issues (#534540). Removal in a
-# month.
-x11-libs/libgksu
-
 # Pacho Ramos <pacho@g.o> (11 Nov 2018)
 # Fails to build (#662000), not compatible with kernel-4, use kernel driver rtsx_pci
 # instead. Removal in a month.

diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
deleted file mode 100644
index 3f4cddacd70..00000000000
--- a/x11-libs/libgksu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libgksu-2.0.12.tar.gz 477903 BLAKE2B c4a130b43d1e9acffd740b9160f98ed318f9861db90acaa047fd9c2a162707fdffa86a4b0854b81486f982099f9440ee7d5b8c5ca65122e0cb2872e3a8aa508f SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573

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 5c007be5b4b..00000000000
--- 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 cd24235a05e..00000000000
--- 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@××××.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@g.o>
-
----
- 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 0f22166fb8b..00000000000
--- 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 5c34cae5613..00000000000
--- 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 15de910474b..00000000000
--- 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 05ff3e0b0ad..00000000000
--- 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 d39bbafd67a..00000000000
--- 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@××××××.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 de3ab6806ee..00000000000
--- 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 955f455b9f8..00000000000
--- 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@××××××.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 3787ef6bfc1..00000000000
--- 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 2c3a8cc786b..00000000000
--- 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 a51a1623deb..00000000000
--- 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 b9fb77f2714..00000000000
--- 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 75386295571..00000000000
--- 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 b3efe9f71e4..00000000000
--- 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 debfd89d0ab..00000000000
--- a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 39980802b1d..00000000000
--- 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@g.o</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>