* [gentoo-commits] gentoo-x86 commit in net-misc/curl: metadata.xml ChangeLog curl-7.20.0-r1.ebuild
@ 2010-03-16 21:43 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2010-03-16 21:43 UTC (permalink / raw
To: gentoo-commits
vapier 10/03/16 21:43:02
Modified: metadata.xml ChangeLog
Added: curl-7.20.0-r1.ebuild
Log:
Rework local USE flags wrt USE=ssl #297096 by Leif Walsh.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.6 net-misc/curl/metadata.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/metadata.xml?r1=1.5&r2=1.6
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml 5 Nov 2009 05:19:17 -0000 1.5
+++ metadata.xml 16 Mar 2010 21:43:01 -0000 1.6
@@ -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>
1.154 net-misc/curl/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/ChangeLog?r1=1.153&r2=1.154
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog 11 Mar 2010 18:01:15 -0000 1.153
+++ ChangeLog 16 Mar 2010 21:43:01 -0000 1.154
@@ -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)
1.1 net-misc/curl/curl-7.20.0-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.20.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/curl/curl-7.20.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: curl-7.20.0-r1.ebuild
===================================================================
# 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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-16 21:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-16 21:43 [gentoo-commits] gentoo-x86 commit in net-misc/curl: metadata.xml ChangeLog curl-7.20.0-r1.ebuild Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox