diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2013-01-22 02:49:44 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-01-22 02:49:44 +0000 |
| commit | 0c893f7e7b23cab0bb2da98ff74c32278dd61c00 (patch) | |
| tree | adcdae25d711bd7c76cc30f283ded3cbfdeaf0ab /net-misc/openssh | |
| parent | Require libpng-1.5.13 as the configure script aborts with older versions. (diff) | |
| download | gentoo-2-0c893f7e7b23cab0bb2da98ff74c32278dd61c00.tar.gz gentoo-2-0c893f7e7b23cab0bb2da98ff74c32278dd61c00.tar.bz2 gentoo-2-0c893f7e7b23cab0bb2da98ff74c32278dd61c00.zip | |
Bug #435372: update ldns dependency for USE=bindist.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-6.1_p1-r1.ebuild | 18 |
2 files changed, 17 insertions, 6 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 95f8df086bec..bda88ecb4ac5 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.463 2013/01/18 12:40:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.464 2013/01/22 02:49:44 robbat2 Exp $ + + 22 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> openssh-6.1_p1-r1.ebuild: + Bug #435372: update ldns dependency for USE=bindist. 18 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> openssh-6.1_p1-r1.ebuild: Only depend on ldns with ldns USE flag enabled. diff --git a/net-misc/openssh/openssh-6.1_p1-r1.ebuild b/net-misc/openssh/openssh-6.1_p1-r1.ebuild index ccad5a8cc28b..18b886ea720c 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.2 2013/01/18 12:40:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1-r1.ebuild,v 1.3 2013/01/22 02:49:44 robbat2 Exp $ EAPI="4" inherit eutils user flag-o-matic multilib autotools pam systemd versionator @@ -34,15 +34,23 @@ LIB_DEPEND="selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) >=sys-libs/zlib-1.2.3[static-libs(+)] tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] )" RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} - ldns? ( net-libs/ldns[ssl] ) + !static? ( + ${LIB_DEPEND//\[static-libs(+)]} + ldns? ( + !bindist? ( net-libs/ldns[ecdsa,ssl] ) + bindist? ( net-libs/ldns[-ecdsa,ssl] ) + ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap )" DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} - ldns? ( net-libs/ldns[ssl,static-libs(+)] ) + static? ( + ${LIB_DEPEND} + ldns? ( + !bindist? ( net-libs/ldns[ecdsa,ssl,static-libs(+)] ) + bindist? ( net-libs/ldns[-ecdsa,ssl,static-libs(+)] ) + ) ) virtual/pkgconfig virtual/os-headers |