Fix linking failure with gold (bug #370019, thanks to Diego Elio Pettenò). Install /etc/env.d/99ssh_askpass like in version 0.4 to set SSH_ASKPASS env variable (bug #437764, thanks to Derk W te Bokkel). Update license.

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

6 files changed, 88 insertions, 11 deletions

diff --git a/net-misc/ssh-askpass-fullscreen/ChangeLog b/net-misc/ssh-askpass-fullscreen/ChangeLog
index 4dd61d4b67e4..62971efcc7c3 100644
--- a/net-misc/ssh-askpass-fullscreen/ChangeLog
+++ b/net-misc/ssh-askpass-fullscreen/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/ssh-askpass-fullscreen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ChangeLog,v 1.23 2012/10/06 09:14:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ChangeLog,v 1.24 2012/10/12 21:41:03 tetromino Exp $
+
+*ssh-askpass-fullscreen-1.0-r1 (12 Oct 2012)
+
+  12 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  ssh-askpass-fullscreen-0.4-r4.ebuild, ssh-askpass-fullscreen-1.0.ebuild,
+  +ssh-askpass-fullscreen-1.0-r1.ebuild,
+  +files/ssh-askpass-fullscreen-1.0-libX11.patch:
+  Fix linking failure with gold (bug #370019, thanks to Diego Elio Pettenò).
+  Install /etc/env.d/99ssh_askpass like in version 0.4 to set SSH_ASKPASS env
+  variable (bug #437764, thanks to Derk W te Bokkel). Update license.
 
 *ssh-askpass-fullscreen-1.0 (06 Oct 2012)
 
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index 0f1b27a59f81..0815e08b05bb 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -3,17 +3,23 @@ Hash: SHA256
 
 AUX 99ssh_askpass 72 SHA256 55a188f761477509dbfd52e539434375acfcfc9723bd53d676d0aabfb4a4154b SHA512 9aadd36d92c4b8acf5ad5c0a63c017d41e8f164eb5eb9fde6a96e5e136976581de2d5acad6b20908d10219ba91cdefb72ef359dfa72ddcbb106b2ae88b525103 WHIRLPOOL 51026da0bc332842975327632ff228bfe599efd6c4c7bbae703ec3341bf5e21e04fea633fd81178fa75b2df681a0591f7ad6da5eb443c8a5964348fb0e5f68ed
 AUX ssh-askpass-fullscreen-0.4-fix-grab.patch 686 SHA256 3c25a4a639e3a30b7bcab033e9f7f5f06934f7553ad7b7ee44c1f31ed60ab42f SHA512 ab9df2b005be9d98637dab2457070a46aeabd87f1bf813bc6948d897c914778f02b0460ec5ecd849bf1c2c1926482f3e5eeb1248e75dceb7b530fae516317cf0 WHIRLPOOL ec24955af973324f2b0a788334f044d69606241f5ec0b4a1a63fbde656d311d3b4d6b7f8fba8c91b70e89f0b2a1f7f0c29afe84c52934badab30d1a1d7cc679f
+AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 SHA256 2c567b1269cc1ab17fe70fa1802163ca93f60fc9c65017f03aa1ad733ba4f6b7 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7 WHIRLPOOL 9ac5180929bf73cc36ae21d1b2ea2a6c36ed7cdad5727be13a01afc2c09eb49ba5e761267bccd68c61cf7eccf433bceb25fa96efac0631bd660a4e4057ad6ea5
 AUX ssh-askpass-fullscreen.1 2542 SHA256 bde17cd9bcb8b1c6d9cf781118c2ce51f0d5742d57c0ea4944095ff5a34332e4 SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e WHIRLPOOL 96f8b7f66cbad880b25f15050708b450972d3886d2df36c69f6f116e347961498e86ad0765f254adb0f4420588dc3cec51db440104e217a5355891fb8ec753e4
 DIST ssh-askpass-fullscreen-0.4.tar.gz 10737 SHA256 07409cb813688261a151d1918690a025eeb7ccc871f93d435795d1c38b4f14ac SHA512 4b26c65150540ada5c53ba05799c7529f3192980839f93a8a5c2f35ebac2f5893486fd173575caacbf87030bc477cbe682e7874c54b33816a7f80ec145233bd5 WHIRLPOOL 6e0d744f157388005f84a3842efb8fb80f694b437623188653715fd992c8ac8f034bdc275ab18f0602a2e68994a8219e8c0f6dec07a14f3902e07870eb923c3b
 DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 SHA256 5843f3c580964be64aa40bf20a03d4d7de326fe8957aae213b38c405c5d10b9a SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b WHIRLPOOL 029b152835dea0f67636f3781cdaf550aa1a3cfb905af233be80a7333606a90a6c635220dc7baf598acd4f4a6b4a66aa07ec4627633c9a0a7ec194a72ef8d2ba
-EBUILD ssh-askpass-fullscreen-0.4-r4.ebuild 1299 SHA256 b45fb716cb4541a35e8b1ef30ababe776670743877755914608c3f2eb9121ceb SHA512 a4e02b9afae0c87ee6900decb6628753e03f031c258aabbdfdd4c76de7d775bdde41500f73080356dd11b1fa5a136c6b137e1a6fe559f2bf0a68e39fc2d1e190 WHIRLPOOL 30152ef031fe143e8fcf4da87040cd8731876171f0d6c9931f1bd6df3c2070d2b2f6b9f7496c459fa37da06c13ca375298d80113d866aa26bcd09be3acc799fa
-EBUILD ssh-askpass-fullscreen-1.0.ebuild 605 SHA256 f9245702b7bab8986a912068849b942dade832ffdb937abbae5db0661c1fca80 SHA512 1b73e9a7ad92a1bd07d5bf02e6025d5da4758e8bc15748996c20c6ea565e13d44866af5383227f511af1f1e0647c62117f6b37c0e8e7d697bc6c572bd3ef2e23 WHIRLPOOL 3cd15cee81fe2fe8803a3dcade41de53a0e1782046e11633d5f2a9b3aa241d51f0d1869b6ebcc372d4380cadd5ed90e10739cd8ca23b6da609e00fe806f85348
-MISC ChangeLog 4006 SHA256 eb1abc5af2d6a1cd5c8048799acf08ba9dbd9bbf1bac8f83404d11dd8aad3a16 SHA512 af44b7fe03bcc62a22dd00a112f334bd2ceebba31b1fda62c6549e81ed9e2f32eea0466d9e82b1de64e21d86aa0b2fc6c0c89d9bddfa2c51b3f4b9e1bf5d0208 WHIRLPOOL 6390ba4475fc8d7d891563c470a4aa86f610bd436e7c9a288e6e1412f0fc1974bc310fa7577b60eff7956c8a14f0f5dd479ae6d7aeebe31efc3af88491b6388f
+EBUILD ssh-askpass-fullscreen-0.4-r4.ebuild 1303 SHA256 d7b8c459d78a62f84ba62aabba59cc82b2c75c725adb4b5bb7acab26c52948ae SHA512 f5eaf24e597abd1bc8b1bf05da1755330a228fcd2e56dcee2db00bd3dfb8e52aca1cfb886ae16420e8e958661611e78b035fef2edc4c4b8eb03b33ed9b0a5c5a WHIRLPOOL 8c68e0e8ebf2e1b826627df239226db890bccaecaa48dbbe4f4ddff6bcc8d9ba938729916749bfb3d662bcb83f881c88a89aef94ae9a64aecb1fad9419e6b2d2
+EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 991 SHA256 5b166dc42e45b845526dd8e1a65c79eda7694e6c21fe366a4b2b2f0f352d67b7 SHA512 0927d7d3ae092f310669c961316579da4ce38dbb62e193ea56fad2110870353cdb462e50f9603b2e260d555a29a79aa3090a3bfbdccd0f9d91701862cc62561e WHIRLPOOL 2dbfc8ddb2279397ecd9126e98dcb92e214bdd70c3b85cd6bc5a6c8ce6115b08a28d8a27319b58c7d8bbfbfc035158957d310f0800fa7284cc9b31ad8b332e5e
+EBUILD ssh-askpass-fullscreen-1.0.ebuild 610 SHA256 ed12165f4cafada3ee57c7861fe878fa58901e736eaaeb7aa915d2de6816154e SHA512 20ddba5db567cbd799c287332a2b2cb52754071a48437550356bcf44d17e91715a797e0f6e8d6a58a87a431ecad3b706202d62673c9ceaaa1bdd9d95f739d12e WHIRLPOOL 3effd31cd1fb14f511520962a690a18087996ede61cb9fd41e88fdb41dfd61369c9d4bd766c2a2a454e7d160bed429af907ddb225dc8d8dd9f0f701f3b680496
+MISC ChangeLog 4508 SHA256 c80da13e117eafe1cf92adff0debdb928b2e3c983de22d2b9fa84934440e020e SHA512 b29cbd14412ff187a726cb7af06139877fe26f6ff6aa3bb048e97f0acc481d41d97acc81f535c6dbcbcec28ee87d652177e196cb4408162367c19af6a3e9e1f6 WHIRLPOOL b01482ab38eb9455d0bb5f31437306623f1f831e257aee81f91fd13a1bbea7ec99d4f76d12616e33e93719bd92b3623b897d092c0930a3ca175e3194e4124894
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBv9owACgkQCaWpQKGI+9QSkACeLywYe3vfvZMaQzAAcsWziPxQ
-7IwAn0WhwpWF1g+Nc2YRokWguUIc1IW9
-=1HPv
+iQEcBAEBCAAGBQJQeI5xAAoJEJ0WA1zPCt1h3lkIAK34p7gjrpUOAWr3d/NOy092
+lvryb8UmdYpzGGvcRDu5A5qUV1/5hqpJPXxVQbWVQj2SZJviytyqovWGTXXasFuK
+jglmCyszvCJgjcnhaJmtLBew0qhI+0fcxqF0x9s/3D0fCakUKc4nratlVObquJ/l
+D6fhiiL3+yJOSCKwKkHFpUyvLK681/0jncpO/iM5cFhgQzO4D9Ngi7ZYFJfCgTkK
+ZlgYJ1aLH8/sDazQkI0VztfsXQ8AaYBdJQm/AXr5R499EkDcudq7ZZ5vJG0YRI8u
+lYlb1ZT085TQ6IBa7KtCHcRqGseQ4okpA8a/X28SUDOIr7mtv8T7eDOe8qNpdS8=
+=j6QV
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..eadf2639b7a2
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch
@@ -0,0 +1,27 @@
+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-0.4-r4.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r4.ebuild
index fa47fcd1b229..549cf66767cc 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r4.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r4.ebuild,v 1.3 2012/05/05 03:20:40 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r4.ebuild,v 1.4 2012/10/12 21:41:03 tetromino Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ DESCRIPTION="A small SSH Askpass replacement written with GTK2."
 HOMEPAGE="https://www.cgabriel.org/software/wiki/SshAskpassFullscreen"
 SRC_URI="http://www.cgabriel.org/download/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
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
new file mode 100644
index 000000000000..a47a57088e28
--- /dev/null
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild,v 1.1 2012/10/12 21:41:03 tetromino Exp $
+
+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 ~x86-fbsd"
+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"
+	eautoreconf
+}
+
+src_install() {
+	default
+	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/ssh-askpass-fullscreen'" >> "${T}/99ssh_askpass" \
+		|| die "envd file creation failed"
+	doenvd "${T}"/99ssh_askpass || die "doenvd failed"
+}
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.ebuild
index a81435343724..829c30e1cc8b 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.ebuild,v 1.1 2012/10/06 09:14:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.ebuild,v 1.2 2012/10/12 21:41:03 tetromino Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ 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"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""