| 1 |
blueness 12/03/31 14:11:13 |
| 2 |
|
| 3 |
Modified: ChangeLog curl-7.25.0.ebuild |
| 4 |
Log: |
| 5 |
Use REQUIRED_USE for gnutls/ssl/nss, bug #410305 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.209 net-misc/curl/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.209&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.209&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.208&r2=1.209 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
| 19 |
retrieving revision 1.208 |
| 20 |
retrieving revision 1.209 |
| 21 |
diff -u -r1.208 -r1.209 |
| 22 |
--- ChangeLog 26 Mar 2012 00:13:23 -0000 1.208 |
| 23 |
+++ ChangeLog 31 Mar 2012 14:11:13 -0000 1.209 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-misc/curl |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.208 2012/03/26 00:13:23 blueness Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.209 2012/03/31 14:11:13 blueness Exp $ |
| 29 |
+ |
| 30 |
+ 31 Mar 2012; Anthony G. Basile <blueness@g.o> curl-7.25.0.ebuild: |
| 31 |
+ Use REQUIRED_USE for gnutls/ssl/nss, bug #410305 |
| 32 |
|
| 33 |
26 Mar 2012; Anthony G. Basile <blueness@g.o> curl-7.25.0.ebuild: |
| 34 |
Forcing a bump to the soname unnecessarily breaks backwards compat |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 net-misc/curl/curl-7.25.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: curl-7.25.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- curl-7.25.0.ebuild 26 Mar 2012 00:13:23 -0000 1.3 |
| 51 |
+++ curl-7.25.0.ebuild 31 Mar 2012 14:11:13 -0000 1.4 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.3 2012/03/26 00:13:23 blueness Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.25.0.ebuild,v 1.4 2012/03/31 14:11:13 blueness Exp $ |
| 57 |
|
| 58 |
EAPI="4" |
| 59 |
|
| 60 |
@@ -15,12 +15,10 @@ |
| 61 |
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" |
| 62 |
IUSE="ares gnutls idn ipv6 kerberos ldap nss ssh ssl static-libs test threads" |
| 63 |
|
| 64 |
-#Note: If we enable more than one of gnutls, ssl or nss, then we will only |
| 65 |
-#use one. gnutls takes priority over ssl which takes priority over nss. |
| 66 |
RDEPEND="ldap? ( net-nds/openldap ) |
| 67 |
gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) |
| 68 |
- ssl? ( !gnutls? ( dev-libs/openssl ) ) |
| 69 |
- nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) |
| 70 |
+ ssl? ( dev-libs/openssl ) |
| 71 |
+ nss? ( dev-libs/nss app-misc/ca-certificates ) |
| 72 |
idn? ( net-dns/libidn ) |
| 73 |
ares? ( net-dns/c-ares ) |
| 74 |
kerberos? ( virtual/krb5 ) |
| 75 |
@@ -40,10 +38,12 @@ |
| 76 |
)" |
| 77 |
# used - but can do without in self test: net-misc/stunnel |
| 78 |
|
| 79 |
-# ares must be disabled for threads and both can be disabled |
| 80 |
-# one can use wether gnutls or nss if ssl is enabled |
| 81 |
+# ares must be disabled for threads |
| 82 |
+# only zero or one of gnutls, ssl, nss, bug #410305 |
| 83 |
REQUIRED_USE="threads? ( !ares ) |
| 84 |
- nss? ( !gnutls )" |
| 85 |
+ gnutls? ( !ssl !nss ) |
| 86 |
+ ssl? ( !nss !gnutls ) |
| 87 |
+ nss? ( !gnutls !ssl )" |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
epatch \ |
| 91 |
@@ -74,14 +74,14 @@ |
| 92 |
fi |
| 93 |
|
| 94 |
# These configuration options are organized alphabetically |
| 95 |
- # within each category. This should make it easier if we ever |
| 96 |
- # decide to make any of these contingent on USE flags. |
| 97 |
+ # within each category. This should make it easier if we |
| 98 |
+ # ever decide to make any of them contingent on USE flags: |
| 99 |
# 1) protocols first. To see them all do |
| 100 |
# 'grep SUPPORT_PROTOCOLS configure.ac' |
| 101 |
# 2) --enable/disable options second. |
| 102 |
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
| 103 |
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort |
| 104 |
# 3) --with/without options third. |
| 105 |
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
| 106 |
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
| 107 |
econf \ |
| 108 |
--enable-dict \ |
| 109 |
--enable-file \ |
Archives