Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 297096 | Differences between
and this patch

Collapse All | Expand All

(-)curl-7.20.0.ebuild (-14 / +18 lines)
Lines 16-27 SRC_URI="http://curl.haxx.se/download/${ Link Here
16
LICENSE="MIT"
16
LICENSE="MIT"
17
SLOT="0"
17
SLOT="0"
18
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
18
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
19
IUSE="openssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"
19
IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test"
20
20
21
RDEPEND="gnutls? ( net-libs/gnutls app-misc/ca-certificates )
21
RDEPEND="ldap? ( net-nds/openldap )
22
	nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
22
	ssl? (
23
	openssl? ( !gnutls? ( !nss? ( dev-libs/openssl app-misc/ca-certificates ) ) )
23
		gnutls? ( net-libs/gnutls app-misc/ca-certificates )
24
	ldap? ( net-nds/openldap )
24
		nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
25
		!gnutls? ( !nss? ( dev-libs/openssl ) )
26
	)
25
	idn? ( net-dns/libidn )
27
	idn? ( net-dns/libidn )
26
	ares? ( >=net-dns/c-ares-1.4.0 )
28
	ares? ( >=net-dns/c-ares-1.4.0 )
27
	kerberos? ( virtual/krb5 )
29
	kerberos? ( virtual/krb5 )
Lines 71-85 src_compile() { Link Here
71
		--without-krb4
73
		--without-krb4
72
		--without-spnego"
74
		--without-spnego"
73
75
74
	if use gnutls; then
76
	if use ssl ; then
75
		myconf="${myconf} --without-ssl --with-gnutls --without-nss"
77
		if use gnutls; then
76
		myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
78
			myconf="${myconf} --without-ssl --with-gnutls --without-nss"
77
	elif use nss; then
79
			myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
78
		myconf="${myconf} --without-ssl --without-gnutls --with-nss"
80
		elif use nss; then
79
		myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
81
			myconf="${myconf} --without-ssl --without-gnutls --with-nss"
80
	elif use openssl; then
82
			myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
81
		myconf="${myconf} --without-gnutls --without-nss --with-ssl"
83
		else
82
		myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
84
			myconf="${myconf} --without-gnutls --without-nss --with-ssl"
85
			myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
86
		fi
83
	else
87
	else
84
		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
88
		myconf="${myconf} --without-gnutls --without-nss --without-ssl"
85
	fi
89
	fi
(-)metadata.xml (-2 / +3 lines)
Lines 8-15 Link Here
8
  <use>
8
  <use>
9
    <flag name="ares">Enabled c-ares dns support</flag>
9
    <flag name="ares">Enabled c-ares dns support</flag>
10
    <flag name="libssh2">Enabled SSH urls in curl using libssh2</flag>
10
    <flag name="libssh2">Enabled SSH urls in curl using libssh2</flag>
11
    <flag name="gnutls">Prefer gnutls over nss and openssl as the crypto engine</flag>
12
    <flag name="nss">Prefer NSS over openssl as the crypto engine</flag>
11
    <flag name="openssl">Use openssl as the crypto engine</flag>
13
    <flag name="openssl">Use openssl as the crypto engine</flag>
12
    <flag name="gnutls">Use gnutls as the crypto engine</flag>
14
    <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
13
    <flag name="nss">Use NSS as the crypto engine</flag>
14
  </use>
15
  </use>
15
</pkgmetadata>
16
</pkgmetadata>

Return to bug 297096