diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-06-17 06:38:10 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-06-17 06:38:10 +0000 |
| commit | 7b7557ee68c8cfbe3639e3e7c106e73226e896a8 (patch) | |
| tree | 4c8d1413d390c13affc813f57315bbb5172b67e0 | |
| parent | marked x86 per bug 421031 (diff) | |
| download | gentoo-2-7b7557ee68c8cfbe3639e3e7c106e73226e896a8.tar.gz gentoo-2-7b7557ee68c8cfbe3639e3e7c106e73226e896a8.tar.bz2 gentoo-2-7b7557ee68c8cfbe3639e3e7c106e73226e896a8.zip | |
Match curl's CURL_SSL defaults for pycurl to prevent block.
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/targets/desktop/gnome/package.use | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index d3f8119b7cc3..02df90ce37c7 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6687 2012/06/17 04:31:59 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6688 2012/06/17 06:38:10 tetromino Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 17 Jun 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + targets/desktop/gnome/package.use: + Match curl's CURL_SSL defaults for pycurl to prevent block. + 17 Jun 2012; Ben de Groot <yngwin@gentoo.org> use.desc: Add libass global useflag diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use index 388832ed865b..98179c764de9 100644 --- a/profiles/targets/desktop/gnome/package.use +++ b/profiles/targets/desktop/gnome/package.use @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.11 2012/05/20 09:31:55 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/gnome/package.use,v 1.12 2012/06/17 06:38:10 tetromino Exp $ # Required by app-accessibility/orca-3 app-accessibility/speech-dispatcher python @@ -31,6 +31,7 @@ net-misc/spice-gtk gtk3 # gnome-documents in gnome-3.2) has +nss in IUSE, pulls in curl[-gnutls,nss] # In >=curl-7.25.0-r1, need CURL_SSL="-gnutls nss -openssl" net-misc/curl -curl_ssl_gnutls curl_ssl_nss -curl_ssl_openssl -gnutls nss +dev-python/pycurl -curl_ssl_gnutls curl_ssl_nss -curl_ssl_openssl # Required by app-admin/sabayon x11-base/xorg-server kdrive |