From: Doug Goldstein Date: Mon, 17 Oct 2005 21:49:33 +0000 (+0000) Subject: get_libdir fixes to work with openssh's use of ssh-askpass X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c5bf06e5cc38886ef561fd3f318dac063f05af5;p=gentoo.git get_libdir fixes to work with openssh's use of ssh-askpass Package-Manager: portage-2.0.53_rc5 --- 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 + -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 x11-ssh-askpass-1.2.2-r1.ebuild: diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest index c5b1ece4bb33..06db8a4bf6a4 100644 --- a/net-misc/x11-ssh-askpass/Manifest +++ b/net-misc/x11-ssh-askpass/Manifest @@ -1,6 +1,17 @@ -MD5 2f35eb3fe5b508d139ed569af1d65653 ChangeLog 2239 -MD5 d8d330386e303b9b36044d872224b3e8 x11-ssh-askpass-1.2.2-r1.ebuild 1035 -MD5 caba812c565130548aa84adc7650c4c0 x11-ssh-askpass-1.2.4.1.ebuild 936 -MD5 a5820e00831335cc416df383e206a5eb files/digest-x11-ssh-askpass-1.2.4.1 74 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 a04319af9b208cfca9958e831c5fc8f5 ChangeLog 2463 MD5 a507a3e3da835a4e8d763cdea183d071 files/digest-x11-ssh-askpass-1.2.2-r1 72 +MD5 a5820e00831335cc416df383e206a5eb files/digest-x11-ssh-askpass-1.2.4.1-r1 74 MD5 1a90e521c0674c6fd9a34b9c6ebfcb62 files/stupid-imake.diff 548 +MD5 2c1edf73176f0cce9f6ee1753c6c08d9 metadata.xml 298 +MD5 d8d330386e303b9b36044d872224b3e8 x11-ssh-askpass-1.2.2-r1.ebuild 1035 +MD5 a7e463b20c6bf868057c22b2203f891a x11-ssh-askpass-1.2.4.1-r1.ebuild 969 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDVBx/BtvusYtCZMsRAie5AKCHKwkSmK7OnwUotny6X7ZiO7a9lQCdERhS +f/nfmz5h7sJtiPjyMblbHTg= +=RVqF +-----END PGP SIGNATURE----- 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 similarity index 100% rename from net-misc/x11-ssh-askpass/files/digest-x11-ssh-askpass-1.2.4.1 rename to 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 @@ + + + +no-herd + + cardoe@gentoo.org + I guess I'll maintain it since I fixed it last + + 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 similarity index 69% rename from net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.ebuild rename to 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 }