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.

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

5 files changed, 76 insertions, 5 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/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=""