Automake-1.13 fix, bug #468764.

(Portage version: 2.2.4/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 10 insertions, 42 deletions

diff --git a/net-misc/ssh-askpass-fullscreen/ChangeLog b/net-misc/ssh-askpass-fullscreen/ChangeLog
index 14aa4ec0b94f..9b7eef739d42 100644
--- a/net-misc/ssh-askpass-fullscreen/ChangeLog
+++ b/net-misc/ssh-askpass-fullscreen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ssh-askpass-fullscreen
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ChangeLog,v 1.32 2013/04/01 18:25:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ChangeLog,v 1.33 2013/09/13 22:44:44 eva Exp $
+
+  14 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -ssh-askpass-fullscreen-0.4-r4.ebuild, ssh-askpass-fullscreen-1.0-r1.ebuild:
+  Automake-1.13 fix, bug #468764.
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org>
   ssh-askpass-fullscreen-1.0-r1.ebuild:
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
deleted file mode 100644
index 549cf66767cc..000000000000
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-0.4-r4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.4 2012/10/12 21:41:03 tetromino Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-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+"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	!net-misc/gtk2-ssh-askpass"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e '2 s/$/$\(LDFLAGS\)/' Makefile || die "sed failed"
-	sed -i -e "s:gcc:$(tc-getCC) ${CFLAGS}:g" Makefile || die "sed failed"
-	epatch "${FILESDIR}/${P}-fix-grab.patch"
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" || die "compile failed"
-}
-
-src_install() {
-	dobin ssh-askpass-fullscreen || die "dobin failed"
-	echo "SSH_ASKPASS=/usr/bin/ssh-askpass-fullscreen" >> "${T}/99ssh_askpass" \
-		|| die "envd file creation failed"
-	doenvd "${T}"/99ssh_askpass || die "doenvd failed"
-	dodoc README AUTHORS ChangeLog || die "missing docs"
-	doman "${FILESDIR}"/ssh-askpass-fullscreen.1 || die "man page failed"
-}
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
index ee6aa11a2a32..1da484d4707e 100644
--- 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.9 2013/04/01 18:25:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild,v 1.10 2013/09/13 22:44:44 eva Exp $
 
 EAPI=4
 
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
 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
 }