diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-09-29 18:56:34 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-09-29 18:56:34 +0000 |
| commit | 5965b9ddbb96f83b91c6a16b3d40466bba608a51 (patch) | |
| tree | e48d3fbfcba5350060f3f38bb52f3e0a9658a59c | |
| parent | Version bump, fixes CVE-2010-0463, bug 307759. (diff) | |
| download | gentoo-2-5965b9ddbb96f83b91c6a16b3d40466bba608a51.tar.gz gentoo-2-5965b9ddbb96f83b91c6a16b3d40466bba608a51.tar.bz2 gentoo-2-5965b9ddbb96f83b91c6a16b3d40466bba608a51.zip | |
libproxy RDEPEND is not really optional as reported in bug #339127 by Priit Laes.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
| -rw-r--r-- | net-voip/telepathy-butterfly/ChangeLog | 7 | ||||
| -rw-r--r-- | net-voip/telepathy-butterfly/metadata.xml | 4 | ||||
| -rw-r--r-- | net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/net-voip/telepathy-butterfly/ChangeLog b/net-voip/telepathy-butterfly/ChangeLog index c98a69f5a28c..a7d181b09cfa 100644 --- a/net-voip/telepathy-butterfly/ChangeLog +++ b/net-voip/telepathy-butterfly/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-voip/telepathy-butterfly # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.27 2010/09/29 10:32:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.28 2010/09/29 18:56:34 pacho Exp $ + + 29 Sep 2010; Pacho Ramos <pacho@gentoo.org> + telepathy-butterfly-0.5.14.ebuild, metadata.xml: + libproxy RDEPEND is not really optional as reported in bug #339127 by + Priit Laes. *telepathy-butterfly-0.5.14 (29 Sep 2010) diff --git a/net-voip/telepathy-butterfly/metadata.xml b/net-voip/telepathy-butterfly/metadata.xml index da29265e68d5..d06378ef0d5f 100644 --- a/net-voip/telepathy-butterfly/metadata.xml +++ b/net-voip/telepathy-butterfly/metadata.xml @@ -4,8 +4,4 @@ <herd>voip</herd> <longdescription lang="en">Telepathy connection manager for MSN network. </longdescription> -<use> - <flag name='libproxy'>Automatically retrieve proxy settings via - <pkg>net-libs/libproxy</pkg></flag> -</use> </pkgmetadata> diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild index d73d0d12112c..5cf8c962a2c9 100644 --- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild +++ b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild,v 1.1 2010/09/29 10:32:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.14.ebuild,v 1.2 2010/09/29 18:56:34 pacho Exp $ EAPI="2" PYTHON_DEPEND="2:2.5" @@ -14,11 +14,11 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86" -IUSE="libproxy" +IUSE="" RDEPEND=">=dev-python/telepathy-python-0.15.17 >=dev-python/papyon-0.5.1 - libproxy? ( >=net-libs/libproxy-0.3.1[python] )" + >=net-libs/libproxy-0.3.1[python]" DOCS="AUTHORS NEWS" |