gentoo resync : 30.09.2020

4 files changed, 2 insertions, 70 deletions

diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index 2e28cb5bdb47..0ca82e5a5789 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,7 +1,4 @@
-AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 BLAKE2B d968d7f1abf69cc5c0fd3c72c690bca1e547b8f0a58424c59ce20c1570c5151b5313b18396f1462804ab0598672129ad31eb3036bb3590304eed733df69b18f9 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7
 AUX ssh-askpass-fullscreen.1 2542 BLAKE2B 495c6ff6e90156962f697b4d4ac4a3a12e99eeee07f04a2d5420d08b3a65226b33cbdf5d16f3e80c720dd31dd0d284ee1c4c05e18d00ec896592ddfb89ec6f6b SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e
-DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 BLAKE2B c47e3123f94504162cec237d6c2ff61825b655efaa9bff2710650cce3e2cb45b10ff842c4d88002461ab51c410dd9fc748ee4cdca7cea56e67bc22497b427e7b SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b
 DIST ssh-askpass-fullscreen-1.2.tar.gz 101597 BLAKE2B 86c632f83d99ed3d6934b921e499fdb75821659d5b54d380a9d7b04355b93602a481e94320d795b614f2e4c67e7a3ffe1e8380065840e31cb9f5e29c5ae8a75d SHA512 478ae81d8d8b174f9a7ba8f7071aca80503ee3ceed945f12fc44f69d08df4ede010de64ab96cacc901b5b29f4a0e4efb86c220e40f2903b8a4306acc4381f88d
-EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 978 BLAKE2B 4b30f111c943406b8277e8c2ab0aeb0e50202e71932fa29a6ad13e857275d3afc810a54e5746960dabd99ea1850e4ccede9516331e61f8574cbc1183398a55b5 SHA512 e284b3d0629ce7290fe1c6710809c2095e1b56203f2c94ec67fd1c4163074b3d7590263880ec513a13b2b522544d60b7f66f57510dea1f5daf74506442b0c1f9
-EBUILD ssh-askpass-fullscreen-1.2.ebuild 966 BLAKE2B 4f54a2a6ad99e91ca22f17acfdc3394d417f2f2e8f7d31bdd1e3e1d3f101b2729c7e1981664822fa955f4530ca24f15b22524421faf09caa5a53485eb424e369 SHA512 44795b1d72b00bf66ac248285cf38a567527c2205543b7f61f0a2825076fd80d72b72b3041540c229394c2b8bb53fa85ebca141f07a12ed1856e8bce859189d9
+EBUILD ssh-askpass-fullscreen-1.2.ebuild 965 BLAKE2B 1d122f4b01249363c7bd08afc56bf699d578a3d7d3409c21033f6cfd899ea5e67850917acc1136103f0eeb4fc6ef64f746a0fa258f2c0788b090399a997c4a84 SHA512 248b82cef128623d5e45c852809cdeeb4884f448e6c0947c5360586ec83e5cbe08c983bdf0667e221e5ad84275115fa1e5a8a8f637eddd7901ad948c5d5850d5
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch
deleted file mode 100644
index eadf2639b7a2..000000000000
--- a/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 313871922aefef489115967d634f991edfaad39c Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 12 Oct 2012 17:10:02 -0400
-Subject: [PATCH] Explicitly link to libX11 for XUngrabServer()
-
-Prevents underlinking failure when using recent ld.gold and recent
-versions of gtk+; see https://bugs.gentoo.org/show_bug.cgi?id=370019
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8f46279..01e36dd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,7 +8,7 @@ AC_PROG_CC
- AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h])
- AC_CHECK_FUNCS([memset])
- 
--PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0],,
-+PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0 x11],,
- 		  AC_MSG_ERROR([>=GTK+-2.10 is required to compile ${PACKAGE_NAME}]
- ))
- 
--- 
-1.7.12.3
-
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
deleted file mode 100644
index d8646cb79125..000000000000
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="A small SSH Askpass replacement written with GTK2"
-HOMEPAGE="https://github.com/atj/ssh-askpass-fullscreen"
-SRC_URI="https://github.com/downloads/atj/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.10.0:2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# https://github.com/atj/ssh-askpass-fullscreen/pull/1
-	epatch "${FILESDIR}/${P}-libX11.patch"
-
-	# automake-1.13 fix, bug #468764
-	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	# Automatically display the passphrase dialog - see bug #437764
-	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/ssh-askpass-fullscreen'" >> "${T}/99ssh_askpass" \
-		|| die "envd file creation failed"
-	doenvd "${T}"/99ssh_askpass
-}
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
index 211cecc3e3b2..07e2e0b9e2bf 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atj/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.10.0:2