Rework local USE flags wrt USE=ssl #297096 by Leif Walsh.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index a2959fb381890468f297824fe38079538dc6a038..00bcdb77f3429960556fcfd9f44c3b6d48a5d53c 100644 (file)
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.153 2010/03/11 18:01:15 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.154 2010/03/16 21:43:01 vapier Exp $
+
+*curl-7.20.0-r1 (16 Mar 2010)
+
+  16 Mar 2010; Mike Frysinger <vapier@gentoo.org> +curl-7.20.0-r1.ebuild,
+  metadata.xml:
+  Rework local USE flags wrt USE=ssl #297096 by Leif Walsh.
 
 *curl-7.20.0 (11 Mar 2010)
 

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 501ceb01e585ae4c68a60da26011078eac7e8b88..40caf09accd03a0e5f7680cb78b46f5b22c0dc2e 100644 (file)
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c SHA1 c63330a3505adb684dd2f1cfa89eae5159cb9cc6 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73
 AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
@@ -9,17 +9,14 @@ DIST curl-7.19.7.tar.bz2 2355121 RMD160 b170b24af3a6d3fc3357e90fc7ae5ef34d722fb4
 DIST curl-7.20.0.tar.bz2 2088522 RMD160 9418ab686551af58df84960277868c77836d6817 SHA1 89215fc4c4cd1e42134d6117255c401372e628de SHA256 eb516915da615d8f6b2b855004d5d4b19c468f080e3736d7a73c5599b9acab11
 EBUILD curl-7.19.6.ebuild 3304 RMD160 2c14d844edb46fa3cb60de2b393bd87b8c48f0b5 SHA1 f4e7af1c290b8cd1be78ceed33853e69fe5149b0 SHA256 40f6347005f10691b1bb091d7e6f0062620c46921832b5329a613216b602ad46
 EBUILD curl-7.19.7.ebuild 2995 RMD160 474a66a21278b34e13d4bce9cc7ce85f1d8f7cb8 SHA1 dcc2a70aa356104e4ca99973a9fa786bf18295b6 SHA256 cb76ac97a2aeffb505fe7620dbdee05fd5a582c7c1a520e373c6069cfb97c77d
+EBUILD curl-7.20.0-r1.ebuild 3237 RMD160 1a87d8c61a3edd482cafb7decdb90428999d0f47 SHA1 1319858edc989f468f17fea830731a508696d76a SHA256 d679664ccaa80ae3df369eff68802aff25025330b7e34883c5617dc49532aa27
 EBUILD curl-7.20.0.ebuild 3055 RMD160 bb01a4e0bf60501e283e903cdb736912a48fc86f SHA1 99900c330d6fcd9b99355f34bdf52bc9813e1b1e SHA256 751cbd667c11352b34938ab9069e75cdfc2f843f76b22023aca8ab31fe634b18
-MISC ChangeLog 26130 RMD160 fd022437306ad82d5226c2e945c9621c18d7be4c SHA1 84e2541b8273a25b188ce88e40879112cca621b5 SHA256 9f6bdd1479c073b2dcb8bab12a24006048be976d5e5023aaeb89ff6345aed27f
-MISC metadata.xml 564 RMD160 fbc71d245e583491775c6c934312e428539a5596 SHA1 b752c747556474e320c0361136580f3975924326 SHA256 66e6a91e67ff9bc0669b755e0a5d1256e69a4389eef6593b9cdd9aa3a406e3f4
+MISC ChangeLog 26313 RMD160 fe7d540c8c200240756f9f4c30fb462f11615af0 SHA1 30e5c371c7aa0457789972b65458105039efd727 SHA256 894d9534ee8c26296b702cb7296b16403492effca430185b542467de5164ad9e
+MISC metadata.xml 697 RMD160 75f1a38985395bbb89971476c5fc004e8f247959 SHA1 d3f52a273d008cfaee85396ff1e01694a2ba3f19 SHA256 f78ea4a02ffb68ecdaa3947f1c0b3a8aaefa36cebb0aa12e9cee1413868463cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQEcBAEBCgAGBQJLmS/0AAoJEAWF714uGAc6EdAH/2KdRphRqUt2odnuVvvOLXT3
-2cFpsTRiZYwzsNA1uTi9/svx1yi6GBOyM1KwEiayYcuvGZPY2iizOp3ORO0d8V+6
-cwgcUfzGOS5iZfhsli3gvTBRO8C8W1JgnEZyeK7pnWTayrpWTyJjGG33iSV67/P8
-TUjriltD62sNp9u/HD5dvQdxQdHDHbTWbPCqMmdORtzHC8LJP9SDINglt9RrgiR6
-UJrxFzvXVUUPEgIRTzPV17WAS0+HCJGNfMo2OAywLylwL3AjxId6YkZ8/ExEplT5
-SOqcIv4ps1vUa3prQZf7M1S+0ydgIwxWvZp0M+DzGNytO2nJtZCmfBogIDMhh48=
-=Uf6b
+iF4EAREIAAYFAkuf+2sACgkQTwhj9JtAlp76agD/fcmEHJL1tpFFA+3UE+tWOJYe
+CnackcXtRixgsOKycBwA/R5vS5NWFBvi78wtDIZeOtEwUX2YoEpTorbIP7bN6DPF
+=bHmr
 -----END PGP SIGNATURE-----

diff --git a/net-misc/curl/curl-7.20.0-r1.ebuild b/net-misc/curl/curl-7.20.0-r1.ebuild
new file mode 100644 (file)
index 0000000..161752b
--- /dev/null
+++ b/net-misc/curl/curl-7.20.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.20.0-r1.ebuild,v 1.1 2010/03/16 21:43:01 vapier Exp $
+
+# NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
+
+inherit multilib eutils
+
+#MY_P=${P/_pre/-}
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
+#SRC_URI="http://cool.haxx.se/curl-daily/${MY_P}.tar.bz2"
+#SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
+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 ~sparc-fbsd ~x86-fbsd"
+IUSE="ares gnutls idn ipv6 kerberos ldap libssh2 nss ssl test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+       ssl? (
+               gnutls? ( net-libs/gnutls app-misc/ca-certificates )
+               nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) )
+               !gnutls? ( !nss? ( dev-libs/openssl ) )
+       )
+       idn? ( net-dns/libidn )
+       ares? ( >=net-dns/c-ares-1.4.0 )
+       kerberos? ( virtual/krb5 )
+       libssh2? ( >=net-libs/libssh2-0.16 )"
+
+# fbopenssl (not in gentoo) --with-spnego
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+       test? (
+               sys-apps/diffutils
+               dev-lang/perl
+       )"
+# used - but can do without in self test: net-misc/stunnel
+
+pkg_setup() {
+       if ! use ssl && ( use gnutls || use nss ) ; then
+               ewarn "USE='gnutls nss' are ignored without USE='ssl'."
+               ewarn "Please review the local USE flags for this package."
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-strip-ldflags.patch
+       epatch "${FILESDIR}"/${PN}-7.19.7-test241.patch
+}
+
+src_compile() {
+
+       myconf="$(use_enable ldap)
+               $(use_enable ldap ldaps)
+               $(use_with idn libidn)
+               $(use_with kerberos gssapi /usr)
+               $(use_with libssh2)
+               $(use_enable ipv6)
+               $(use_enable ares)
+               --enable-http
+               --enable-ftp
+               --enable-gopher
+               --enable-file
+               --enable-dict
+               --enable-manual
+               --enable-telnet
+               --enable-smtp
+               --enable-pop3
+               --enable-imap
+               --enable-rtsp
+               --enable-nonblocking
+               --enable-largefile
+               --enable-maintainer-mode
+               --disable-sspi
+               --without-krb4
+               --without-spnego"
+
+       if use ssl ; then
+               if use gnutls; then
+                       myconf="${myconf} --without-ssl --with-gnutls --without-nss"
+                       myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+               elif use nss; then
+                       myconf="${myconf} --without-ssl --without-gnutls --with-nss"
+                       myconf="${myconf} --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+               else
+                       myconf="${myconf} --without-gnutls --without-nss --with-ssl"
+                       myconf="${myconf} --without-ca-bundle --with-ca-path=/etc/ssl/certs"
+               fi
+       else
+               myconf="${myconf} --without-gnutls --without-nss --without-ssl"
+       fi
+
+       econf ${myconf} || die 'configure failed'
+
+       emake || die "install failed for current version"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "installed failed for current version"
+       rm -rf "${D}"/etc/
+
+       # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
+       insinto /usr/share/aclocal
+       doins docs/libcurl/libcurl.m4
+
+       dodoc CHANGES README
+       dodoc docs/FEATURES docs/INTERNALS
+       dodoc docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE
+}

diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 64d6213dfb3c3af3055064acc99f2acd973cf4e9..fce6d88d21d0713ed17dc72bc0d10f40d15116c0 100644 (file)
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -8,8 +8,9 @@
   <use>
     <flag name="ares">Enabled c-ares dns support</flag>
     <flag name="libssh2">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="openssl">Use openssl as the crypto engine</flag>
-    <flag name="gnutls">Use gnutls as the crypto engine</flag>
-    <flag name="nss">Use NSS as the crypto engine</flag>
+    <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
   </use>
 </pkgmetadata>