diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-02-21 05:30:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-02-21 05:30:13 +0000 |
| commit | f2890f6761b319424f8ec14d5c25a4c5f2325ee9 (patch) | |
| tree | 43698c837ffb98786383deee3d9d3c5a1d28ce2a /net-misc | |
| parent | Add ~arm-linux keyword. (diff) | |
| download | gentoo-2-f2890f6761b319424f8ec14d5c25a4c5f2325ee9.tar.gz gentoo-2-f2890f6761b319424f8ec14d5c25a4c5f2325ee9.tar.bz2 gentoo-2-f2890f6761b319424f8ec14d5c25a4c5f2325ee9.zip | |
Fix for prefix and add ~arm-linux + ~x86-linux keywords.
(Portage version: 2.2.0_alpha163_p9/cvs/Linux i686, RepoMan options: --force, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-6.1_p1-r1.ebuild | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 6544587581e5..4c4919479082 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.465 2013/01/22 02:51:55 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.466 2013/02/21 05:30:13 zmedico Exp $ + + 21 Feb 2013; Zac Medico <zmedico@gentoo.org> openssh-6.1_p1-r1.ebuild: + Fix for prefix and add ~arm-linux + ~x86-linux keywords. 22 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> openssh-6.1_p1-r1.ebuild: Whitespace. diff --git a/net-misc/openssh/openssh-6.1_p1-r1.ebuild b/net-misc/openssh/openssh-6.1_p1-r1.ebuild index f78f8d92a3bb..711aa7772584 100644 --- a/net-misc/openssh/openssh-6.1_p1-r1.ebuild +++ b/net-misc/openssh/openssh-6.1_p1-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/openssh/openssh-6.1_p1-r1.ebuild,v 1.4 2013/01/22 02:51:55 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1-r1.ebuild,v 1.5 2013/02/21 05:30:13 zmedico Exp $ EAPI="4" inherit eutils user flag-o-matic multilib autotools pam systemd versionator @@ -23,7 +23,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap ldns libedit pam selinux skey static tcpd X X509" LIB_DEPEND="selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) @@ -89,7 +89,7 @@ save_version() { src_prepare() { sed -i \ - -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \ + -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:' \ pathnames.h || die # keep this as we need it to avoid the conflict between LPK and HPN changing # this file. @@ -183,11 +183,11 @@ src_configure() { econf \ --with-ldflags="${LDFLAGS}" \ --disable-strip \ - --with-pid-dir=/var/run \ - --sysconfdir=/etc/ssh \ - --libexecdir=/usr/$(get_libdir)/misc \ - --datadir=/usr/share/openssh \ - --with-privsep-path=/var/empty \ + --with-pid-dir="${EPREFIX}"/var/run \ + --sysconfdir="${EPREFIX}"/etc/ssh \ + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc \ + --datadir="${EPREFIX}"/usr/share/openssh \ + --with-privsep-path="${EPREFIX}"/var/empty \ --with-privsep-user=sshd \ --with-md5-passwords \ --with-ssl-engine \ |