diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-01-18 12:40:16 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-01-18 12:40:16 +0000 |
commit | ba14800be2ccc03191ab6123c9263591b58c004e (patch) | |
tree | b82df073ebeaf4a10b3017053e39312e2a6f006c /net-misc/openssh | |
parent | version bump fix #449876 and #420643 (diff) | |
download | gentoo-2-ba14800be2ccc03191ab6123c9263591b58c004e.tar.gz gentoo-2-ba14800be2ccc03191ab6123c9263591b58c004e.tar.bz2 gentoo-2-ba14800be2ccc03191ab6123c9263591b58c004e.zip |
Only depend on ldns with ldns USE flag enabled.
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 1CD13C8AD4301342)
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 | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 9c4b5d2facb9..95f8df086bec 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.462 2013/01/18 01:14:14 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.463 2013/01/18 12:40:16 flameeyes Exp $ + + 18 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> openssh-6.1_p1-r1.ebuild: + Only depend on ldns with ldns USE flag enabled. *openssh-6.1_p1-r1 (18 Jan 2013) diff --git a/net-misc/openssh/openssh-6.1_p1-r1.ebuild b/net-misc/openssh/openssh-6.1_p1-r1.ebuild index e52456bedd78..ccad5a8cc28b 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.1 2013/01/18 01:14:14 robbat2 Exp $ +# $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 $ EAPI="4" inherit eutils user flag-o-matic multilib autotools pam systemd versionator @@ -33,12 +33,17 @@ LIB_DEPEND="selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) dev-libs/openssl[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(+)]} net-libs/ldns[ssl] ) +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} + ldns? ( net-libs/ldns[ssl] ) + ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap )" DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} net-libs/ldns[ssl,static-libs(+)] ) + static? ( ${LIB_DEPEND} + ldns? ( net-libs/ldns[ssl,static-libs(+)] ) + ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf" |