summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-06-17 06:38:10 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-06-17 06:38:10 +0000
commit7fac6c69d9015de2b1eccd56f0dd9ddaed8ac8c2 (patch)
tree92148dc64afd1afaa1d4d5c65e2f4d8c5447d43b /profiles
parentmarked x86 per bug 421031 (diff)
downloadhistorical-7fac6c69d9015de2b1eccd56f0dd9ddaed8ac8c2.tar.gz
historical-7fac6c69d9015de2b1eccd56f0dd9ddaed8ac8c2.tar.bz2
historical-7fac6c69d9015de2b1eccd56f0dd9ddaed8ac8c2.zip
Match curl's CURL_SSL defaults for pycurl to prevent block.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/targets/desktop/gnome/package.use3
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