diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2012-11-02 17:04:04 +0000 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2012-11-02 17:04:04 +0000 |
commit | 4074c723ec3050e0ccd7a3364959f9ebcb6eb278 (patch) | |
tree | c7bdb7b85adf7d606501acb065ce05e10e8774ce /dev-libs/ucommon | |
parent | Fix site initialisation, bug 440882. (diff) | |
download | gentoo-2-4074c723ec3050e0ccd7a3364959f9ebcb6eb278.tar.gz gentoo-2-4074c723ec3050e0ccd7a3364959f9ebcb6eb278.tar.bz2 gentoo-2-4074c723ec3050e0ccd7a3364959f9ebcb6eb278.zip |
Add workaround for USE="gnutls" dependencies by locking it on gnutls[-nettle]
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-libs/ucommon')
-rw-r--r-- | dev-libs/ucommon/ChangeLog | 5 | ||||
-rw-r--r-- | dev-libs/ucommon/ucommon-5.2.2-r3.ebuild | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-libs/ucommon/ChangeLog b/dev-libs/ucommon/ChangeLog index 34cb458bd97c..9a49d3d4b3ee 100644 --- a/dev-libs/ucommon/ChangeLog +++ b/dev-libs/ucommon/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/ucommon # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.11 2012/10/25 02:56:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.12 2012/11/02 17:04:04 pinkbyte Exp $ + + 02 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> ucommon-5.2.2-r3.ebuild: + Add workaround for USE="gnutls" dependencies by locking it on gnutls[-nettle] 25 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml, ucommon-5.2.2-r3.ebuild: diff --git a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild index 074b1996d391..8a034e7f7452 100644 --- a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild +++ b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild @@ -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/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild,v 1.6 2012/10/25 02:56:11 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild,v 1.7 2012/11/02 17:04:04 pinkbyte Exp $ EAPI="4" @@ -17,7 +17,10 @@ IUSE="doc static-libs socks +cxx debug ssl gnutls" RDEPEND="ssl? ( !gnutls? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) + gnutls? ( + net-libs/gnutls[-nettle] + dev-libs/libgcrypt + ) )" DEPEND="virtual/pkgconfig |