From 80eedf57264166f7961cd4ba0748eb7c80f78631 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 1 Dec 2011 21:11:06 +0000 Subject: [PATCH] Convert USE=libssh2 to USE=ssh to match other packages, and to match the functionality provided rather than the library implementation. Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64 --- net-misc/curl/ChangeLog | 8 +++++++- net-misc/curl/Manifest | 22 +++++++++++----------- net-misc/curl/curl-7.21.4.ebuild | 8 ++++---- net-misc/curl/curl-7.21.6.ebuild | 8 ++++---- net-misc/curl/curl-7.21.7-r2.ebuild | 8 ++++---- net-misc/curl/curl-7.21.7.ebuild | 8 ++++---- net-misc/curl/curl-7.22.0.ebuild | 8 ++++---- net-misc/curl/curl-7.23.1.ebuild | 8 ++++---- net-misc/curl/metadata.xml | 2 +- 9 files changed, 43 insertions(+), 37 deletions(-) diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 70eef8a37957..0ba41990fff8 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/curl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.195 2011/12/01 20:59:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.196 2011/12/01 21:11:06 vapier Exp $ + + 01 Dec 2011; Mike Frysinger curl-7.21.4.ebuild, + curl-7.21.6.ebuild, curl-7.21.7.ebuild, curl-7.21.7-r2.ebuild, + curl-7.22.0.ebuild, curl-7.23.1.ebuild, metadata.xml: + Convert USE=libssh2 to USE=ssh to match other packages, and to match the + functionality provided rather than the library implementation. 01 Dec 2011; Mike Frysinger curl-7.23.1.ebuild: Move into ~arch w/Christoph blessing. diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 6b2fc71b864f..7b8213a4807d 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -15,18 +15,18 @@ DIST curl-7.21.6.tar.bz2 2311355 RMD160 25741abc0ec79d6f0da249aa50d310397bb92d17 DIST curl-7.21.7.tar.bz2 2319682 RMD160 c4c8afe66fb30be9eec8233c22db6d5beed00e39 SHA1 88aab0188ac86c3d13118bb5b6ee49a83e53b0ce SHA256 1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a DIST curl-7.22.0.tar.bz2 2337931 RMD160 c65a5f2c4454ec5be3db66d4816bd8c0fcc7a91a SHA1 8e7b2b0ca933812614ec0eade2f83e77632247d6 SHA256 bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112 DIST curl-7.23.1.tar.bz2 2376653 RMD160 96c45f38361d04a939e135c9e5fcf27ca1180abe SHA1 9bac69696446ead85e59d8488098ee84cf897b7e SHA256 7d8c8cef8f244118245c37853cb175bd95c156ff453730ec2c88189b05a7c06e -EBUILD curl-7.21.4.ebuild 3500 RMD160 da59518fe336b44075f2b93524fa48e57db94401 SHA1 3d318ddd125f1c6f723a9f96af895e74202808ce SHA256 a3c54ce1f7690fa7396236be7d2b247d4cd0ec9fe3b0ee8dc7b9c52261080de6 -EBUILD curl-7.21.6.ebuild 3491 RMD160 ff149e8b7243622e68984589b289914cce039ee3 SHA1 37e45a232c442d363460d6bcf06a50734a6f645e SHA256 2fe3323f68bd5e3a37bb06ab8d0a650ce467556e06233a776712a3e115f17c6d -EBUILD curl-7.21.7-r2.ebuild 3716 RMD160 a3ef5e30a134b232bca6c9b273283fefef076f95 SHA1 196de6831df4b1065f0bda045a46cdddafa8c00b SHA256 27d0c8d72c7c13fcf1f9d0a40b5962e9e48cd9296140520c92b6326ac41109c0 -EBUILD curl-7.21.7.ebuild 3537 RMD160 d18c4326bd7b53625019add90b6e68cb03871442 SHA1 9d95054e41000a5d042e3df2dd7018367e696d09 SHA256 2fce4d8718548f70f1c7328cf922d31e038bfa7e68a3cec3cbc7046d6db10603 -EBUILD curl-7.22.0.ebuild 3608 RMD160 5e7890f20ef35b492a6f1ddd6d96734a21d78830 SHA1 4507f96241275e6fa87121b0323d7b25a5e0d296 SHA256 95933208c4c0d1814310ae5521ffe827a58f012191c49cef512faa034eb80c59 -EBUILD curl-7.23.1.ebuild 3688 RMD160 b5ff05adb5b88d800f60bc6fd8db25281314ebd5 SHA1 a9e103ede90b3d617f978dc60d8d76935bcd2630 SHA256 92e6bbfcc328bd5bf5bc5ffc0477cbba6ec713a68c85d6ba0476b27f714926b9 -MISC ChangeLog 32592 RMD160 bc6ccabae4ba9b54bd2f682c1ce70fce57274daf SHA1 69ff343e9a2b113484f3266c8f628dd2089694e6 SHA256 f98de6f22c9e49fcdd2a59304880b142ea9d56f5b73d0b548980ba379b201654 -MISC metadata.xml 638 RMD160 6e685dbc2c33ff964b46795a7083b45d03c6ba4d SHA1 eec3433434ad3574c097b24b51eb58f4ecb2bbad SHA256 3d7a27dacbea52f5aa76206ccdc7926bddcd3c0eb1751a881cb8aec332b5f7d6 +EBUILD curl-7.21.4.ebuild 3495 RMD160 8dee1c41897ada98d1d69bbd813c4906f77dd154 SHA1 f7e61bb442beb6508357d209d3f048862db0441c SHA256 13116905bdd366800011eba8d1906c351d5d10754965041d3de7857f9d6fe03c +EBUILD curl-7.21.6.ebuild 3484 RMD160 5c8a430c1fbd7c7e351e919cc2051c76c830b5e5 SHA1 ba9daa5366b7a15577090709e48f13aced1d2e2e SHA256 07288c387e1502506ef2213bf1b4f9427871defc133a793b44c05316e678fc16 +EBUILD curl-7.21.7-r2.ebuild 3711 RMD160 bf3db09bf106a6fb58cce9cb488b6b1c3bd200ad SHA1 3e1906dd0f689fad4af4e24242ffaf72ba23fb86 SHA256 3b2a603f7cfa1989a1cf001ceff773b4862e77d6d0ce628a4aaf92f0eea843e5 +EBUILD curl-7.21.7.ebuild 3532 RMD160 2ecb16b81483b240c04b4a18bdf2ef68ec362e35 SHA1 13ebd8ca15b767ffb92b3e8ea039429df7014b7b SHA256 d8167ea6848849984bf7630f77d474a99aeb45396e987c001a936321d812589a +EBUILD curl-7.22.0.ebuild 3603 RMD160 57cdd6f5bb7ed4c2adaf36340dfdb855b21e3353 SHA1 a547dd037ff14239529b2a1e3cc9d1c833e790d0 SHA256 f2141129a304ed91cc0209fce43a691781ecb9a28fb8d5cc33cefab8dde0220f +EBUILD curl-7.23.1.ebuild 3684 RMD160 9818d937a5817e211c26ed223f92bed8c230cda1 SHA1 6f416ff1d4b6e6234559be35e0ca10defa335afd SHA256 e583c7bf3f084a4583b2a236505610944ebcd7268a73907b74635e68db5c504c +MISC ChangeLog 32924 RMD160 07e2b50516f364dd0c94e8322c52883071f4049c SHA1 764f707037c6c8fe52619368373eb2db255b12e0 SHA256 063e326023da03d9a93620236e5f0ed6598d6c1aa9264a8454099b49a2298a27 +MISC metadata.xml 634 RMD160 0ab808e27fb759016357631bd78a6c2716cc4b09 SHA1 88b81601958d6474e542f4c2ca0b4d54ece55500 SHA256 41048ab9db0fac2e2885cdb2c611f855452f59e2e8f4d5e2fc5fa38472d567aa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7X6tEACgkQaC/OocHi7JaPdQD8CK/WTSXrBHw5FP2g0M8ReNRa -Sk9KYKdE9eoGZjF1DPYA+gLMzHJKXIZ5NdJ0WR8gW9c4FzmVRKlaS4CncLF7AZO3 -=0WLu +iF4EAREIAAYFAk7X7XIACgkQaC/OocHi7JaqfAD9FpFKlGtjgbxH3FYy2fT4yOXn +g1xagJAfIsgVNRMWZdgA/R5JKwqG7XfFFynL2RP9DQWQCyvrvk7ukFvaCDPnaEmI +=15me -----END PGP SIGNATURE----- diff --git a/net-misc/curl/curl-7.21.4.ebuild b/net-misc/curl/curl-7.21.4.ebuild index a05b8d745d4a..27c38a7e257b 100644 --- a/net-misc/curl/curl-7.21.4.ebuild +++ b/net-misc/curl/curl-7.21.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.11 2011/06/12 14:39:31 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.4.ebuild,v 1.12 2011/12/01 21:11:06 vapier Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -15,7 +15,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) ssl? ( @@ -26,7 +26,7 @@ RDEPEND="ldap? ( net-nds/openldap ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) - libssh2? ( >=net-libs/libssh2-0.16 )" + ssh? ( >=net-libs/libssh2-0.16 )" # rtmpdump ( media-video/rtmpdump ) / --with-librtmp # fbopenssl (not in gentoo) --with-spnego @@ -62,7 +62,7 @@ src_configure() { $(use_enable ldap ldaps) $(use_with idn libidn) $(use_with kerberos gssapi "${EPREFIX}"/usr) - $(use_with libssh2) + $(use_with ssh libssh2) $(use_enable static-libs static) $(use_enable ipv6) $(use_enable threads threaded-resolver) diff --git a/net-misc/curl/curl-7.21.6.ebuild b/net-misc/curl/curl-7.21.6.ebuild index 01c3ca7fec7e..7db58193f274 100644 --- a/net-misc/curl/curl-7.21.6.ebuild +++ b/net-misc/curl/curl-7.21.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v 1.1 2011/05/23 08:51:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.6.ebuild,v 1.2 2011/12/01 21:11:06 vapier Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -15,7 +15,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) ssl? ( @@ -26,7 +26,7 @@ RDEPEND="ldap? ( net-nds/openldap ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) - libssh2? ( >=net-libs/libssh2-0.16 )" + ssh? ( >=net-libs/libssh2-0.16 )" # rtmpdump ( media-video/rtmpdump ) / --with-librtmp # fbopenssl (not in gentoo) --with-spnego @@ -62,7 +62,7 @@ src_configure() { $(use_enable ldap ldaps) $(use_with idn libidn) $(use_with kerberos gssapi "${EPREFIX}"/usr) - $(use_with libssh2) + $(use_with ssh libssh2) $(use_enable static-libs static) $(use_enable ipv6) $(use_enable threads threaded-resolver) diff --git a/net-misc/curl/curl-7.21.7-r2.ebuild b/net-misc/curl/curl-7.21.7-r2.ebuild index a5997d87ccbd..9e641dcd8316 100644 --- a/net-misc/curl/curl-7.21.7-r2.ebuild +++ b/net-misc/curl/curl-7.21.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.3 2011/08/21 15:40:07 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7-r2.ebuild,v 1.4 2011/12/01 21:11:06 vapier Exp $ EAPI=4 @@ -13,7 +13,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) ssl? ( @@ -24,7 +24,7 @@ RDEPEND="ldap? ( net-nds/openldap ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) - libssh2? ( >=net-libs/libssh2-0.16 )" + ssh? ( >=net-libs/libssh2-0.16 )" # rtmpdump ( media-video/rtmpdump ) / --with-librtmp # fbopenssl (not in gentoo) --with-spnego @@ -63,7 +63,7 @@ src_configure() { $(use_enable ldap ldaps) $(use_with idn libidn) $(use_with kerberos gssapi "${EPREFIX}"/usr) - $(use_with libssh2) + $(use_with ssh libssh2) $(use_enable static-libs static) $(use_enable ipv6) $(use_enable threads threaded-resolver) diff --git a/net-misc/curl/curl-7.21.7.ebuild b/net-misc/curl/curl-7.21.7.ebuild index 5b7ce1fe0881..13eb0ec64c92 100644 --- a/net-misc/curl/curl-7.21.7.ebuild +++ b/net-misc/curl/curl-7.21.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.4 2011/07/23 11:43:48 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.21.7.ebuild,v 1.5 2011/12/01 21:11:06 vapier Exp $ # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl! @@ -15,7 +15,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) ssl? ( @@ -26,7 +26,7 @@ RDEPEND="ldap? ( net-nds/openldap ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) - libssh2? ( >=net-libs/libssh2-0.16 )" + ssh? ( >=net-libs/libssh2-0.16 )" # rtmpdump ( media-video/rtmpdump ) / --with-librtmp # fbopenssl (not in gentoo) --with-spnego @@ -63,7 +63,7 @@ src_configure() { $(use_enable ldap ldaps) $(use_with idn libidn) $(use_with kerberos gssapi "${EPREFIX}"/usr) - $(use_with libssh2) + $(use_with ssh libssh2) $(use_enable static-libs static) $(use_enable ipv6) $(use_enable threads threaded-resolver) diff --git a/net-misc/curl/curl-7.22.0.ebuild b/net-misc/curl/curl-7.22.0.ebuild index 4a3666b53c9a..1d9da11e3690 100644 --- a/net-misc/curl/curl-7.22.0.ebuild +++ b/net-misc/curl/curl-7.22.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.2 2011/11/14 17:10:55 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.22.0.ebuild,v 1.3 2011/12/01 21:11:06 vapier Exp $ EAPI=4 @@ -13,7 +13,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) @@ -22,7 +22,7 @@ RDEPEND="ldap? ( net-nds/openldap ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) - libssh2? ( >=net-libs/libssh2-0.16 )" + ssh? ( >=net-libs/libssh2-0.16 )" # rtmpdump ( media-video/rtmpdump ) / --with-librtmp # fbopenssl (not in gentoo) --with-spnego @@ -58,7 +58,7 @@ src_configure() { $(use_enable ldap ldaps) $(use_with idn libidn) $(use_with kerberos gssapi "${EPREFIX}"/usr) - $(use_with libssh2) + $(use_with ssh libssh2) $(use_enable static-libs static) $(use_enable ipv6) $(use_enable threads threaded-resolver) diff --git a/net-misc/curl/curl-7.23.1.ebuild b/net-misc/curl/curl-7.23.1.ebuild index f29077a56039..460c9fb05242 100644 --- a/net-misc/curl/curl-7.23.1.ebuild +++ b/net-misc/curl/curl-7.23.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild,v 1.2 2011/12/01 20:59:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.23.1.ebuild,v 1.3 2011/12/01 21:11:06 vapier Exp $ EAPI=4 @@ -13,7 +13,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl static-libs test threads" +IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" RDEPEND="ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) @@ -22,7 +22,7 @@ RDEPEND="ldap? ( net-nds/openldap ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) - libssh2? ( >=net-libs/libssh2-0.16 )" + ssh? ( >=net-libs/libssh2-0.16 )" # rtmpdump ( media-video/rtmpdump ) / --with-librtmp # fbopenssl (not in gentoo) --with-spnego @@ -73,7 +73,7 @@ src_configure() { $(use_enable ldap ldaps) \ $(use_with idn libidn) \ $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - $(use_with libssh2) \ + $(use_with ssh libssh2) \ $(use_enable static-libs static) \ $(use_enable ipv6) \ $(use_enable threads threaded-resolver) \ diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml index 9a83db96b5f2..fe8af261e466 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -7,7 +7,7 @@ Enabled c-ares dns support - Enabled SSH urls in curl using libssh2 + Enabled SSH urls in curl using libssh2 Prefer gnutls over nss and openssl as the crypto engine Prefer NSS over openssl as the crypto engine Enable crypto engine support (via openssl if USE='-gnutls -nss') -- 2.26.2