Convert USE=libssh2 to USE=ssh to match other packages, and to match the functionality provided rather than the library implementation.

(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

8 files changed, 32 insertions, 26 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 <vapier@gentoo.org> 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 <vapier@gentoo.org> curl-7.23.1.ebuild:
   Move into ~arch w/Christoph blessing.
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 @@
   </maintainer>
   <use>
     <flag name="ares">Enabled c-ares dns support</flag>
-    <flag name="libssh2">Enabled SSH urls in curl using libssh2</flag>
+    <flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
     <flag name="gnutls">Prefer gnutls over nss and openssl as the crypto engine</flag>
     <flag name="nss">Prefer NSS over openssl as the crypto engine</flag>
     <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>