summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2015-05-15 08:47:31 +0000
committerMikle Kolyada <zlogene@gentoo.org>2015-05-15 08:47:31 +0000
commit9bcc17ca16a6cfd80ce2e1caeb87b5f6b9b54503 (patch)
treeaa34aa856ed8c8c16fe8c163f5b7e6444ac9fea8 /net-misc/curl
parentFix cross-compiling logic and how we handle pkg-config. (diff)
downloadgentoo-2-9bcc17ca16a6cfd80ce2e1caeb87b5f6b9b54503.tar.gz
gentoo-2-9bcc17ca16a6cfd80ce2e1caeb87b5f6b9b54503.tar.bz2
gentoo-2-9bcc17ca16a6cfd80ce2e1caeb87b5f6b9b54503.zip
x86 stable wrt bug #548130
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)
Diffstat (limited to 'net-misc/curl')
-rw-r--r--net-misc/curl/ChangeLog5
-rw-r--r--net-misc/curl/curl-7.42.1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 6da9564fe6b2..90f4bf55818c 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/curl
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.410 2015/05/13 05:45:08 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.411 2015/05/15 08:47:31 zlogene Exp $
+
+ 15 May 2015; Mikle Kolyada <zlogene@gentoo.org> curl-7.42.1.ebuild:
+ x86 stable wrt bug #548130
13 May 2015; Jack Morgan <jmorgan@gentoo.org> curl-7.42.1.ebuild:
ia64 stable wrt bug #548130
diff --git a/net-misc/curl/curl-7.42.1.ebuild b/net-misc/curl/curl-7.42.1.ebuild
index a6628194e9d1..c9a33a814a76 100644
--- a/net-misc/curl/curl-7.42.1.ebuild
+++ b/net-misc/curl/curl-7.42.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.42.1.ebuild,v 1.5 2015/05/13 05:45:08 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.42.1.ebuild,v 1.6 2015/05/15 08:47:31 zlogene Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
IUSE="${IUSE} elibc_Winnt"