get_libdir fixes to work with openssh's use of ssh-askpass

(Portage version: 2.0.53_rc5)

4 files changed, 24 insertions, 7 deletions

diff --git a/net-misc/x11-ssh-askpass/ChangeLog b/net-misc/x11-ssh-askpass/ChangeLog
index 846033384846..6715bea107f6 100644
--- a/net-misc/x11-ssh-askpass/ChangeLog
+++ b/net-misc/x11-ssh-askpass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/x11-ssh-askpass
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/ChangeLog,v 1.15 2005/09/16 03:26:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/ChangeLog,v 1.16 2005/10/17 21:49:33 cardoe Exp $
+
+*x11-ssh-askpass-1.2.4.1-r1 (17 Oct 2005)
+
+  17 Oct 2005; Doug Goldstein <cardoe@gentoo.org>
+  -x11-ssh-askpass-1.2.4.1.ebuild, +x11-ssh-askpass-1.2.4.1-r1.ebuild:
+  get_libdir fixes to work with openssh's use of ssh-askpass
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   x11-ssh-askpass-1.2.2-r1.ebuild:
diff --git a/net-misc/x11-ssh-askpass/files/digest-x11-ssh-askpass-1.2.4.1 b/net-misc/x11-ssh-askpass/files/digest-x11-ssh-askpass-1.2.4.1-r1
index 69ea6b584bef..69ea6b584bef 100644
--- a/net-misc/x11-ssh-askpass/files/digest-x11-ssh-askpass-1.2.4.1
+++ b/net-misc/x11-ssh-askpass/files/digest-x11-ssh-askpass-1.2.4.1-r1
diff --git a/net-misc/x11-ssh-askpass/metadata.xml b/net-misc/x11-ssh-askpass/metadata.xml
new file mode 100644
index 000000000000..a4a4067894a2
--- /dev/null
+++ b/net-misc/x11-ssh-askpass/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>cardoe@gentoo.org</email>
+  <description>I guess I'll maintain it since I fixed it last</description>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
index e96eb0f9d8ce..bce7998a19c1 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.ebuild,v 1.4 2004/07/01 22:12:37 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild,v 1.1 2005/10/17 21:49:33 cardoe Exp $
+
+inherit eutils multilib
 
 IUSE=""
 DESCRIPTION="X11-based passphrase dialog for use with OpenSSH"
@@ -13,11 +15,11 @@ KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 
 DEPEND="virtual/libc
 	virtual/x11"
-RDEPEND="virtual/x11
+RDEPEND="${DEPEND}
 	virtual/ssh"
 
 src_compile() {
-	./configure --prefix=/usr --libexecdir=/usr/lib/misc || die
+	econf --libexecdir=/usr/$(get_libdir)/misc || die
 	xmkmf || die
 	make includes || die
 	make "CDEBUGFLAGS=${CFLAGS}" || die
@@ -26,7 +28,7 @@ src_compile() {
 src_install() {
 	newman x11-ssh-askpass.man x11-ssh-askpass.1
 	dobin x11-ssh-askpass
-	dodir /usr/lib/misc
-	dosym /usr/bin/x11-ssh-askpass /usr/lib/misc/ssh-askpass
+	dodir /usr/$(get_libdir)/misc
+	dosym /usr/bin/x11-ssh-askpass /usr/$(get_libdir)/misc/ssh-askpass
 	dodoc ChangeLog README TODO
 }