Fix

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 7 insertions, 67 deletions

diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index 38b47fcf74e9..bf5338803bc1 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-voip/telepathy-gabble
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.114 2013/04/01 18:25:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.115 2013/05/10 22:07:47 eva Exp $
+
+  10 May 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -telepathy-gabble-0.16.1.ebuild, telepathy-gabble-0.16.4.ebuild:
+  Fix openssl requirements, bug #460456.
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> telepathy-gabble-0.16.4.ebuild:
   Stable for sparc, wrt bug #458984
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.16.1.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.16.1.ebuild
deleted file mode 100644
index fa2fa5c672fe..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.16.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.1.ebuild,v 1.6 2012/10/28 16:29:58 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-
-inherit python eutils
-
-DESCRIPTION="A Jabber/XMPP connection manager, this handles single and multi user chats and voice calls."
-HOMEPAGE="http://telepathy.freedesktop.org"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="+jingle test"
-
-RDEPEND=">=dev-libs/glib-2.30:2
-	>=sys-apps/dbus-1.1.0
-	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.18
-	>=net-libs/libnice-0.0.11
-	>=net-libs/gnutls-2.10.2
-
-	dev-db/sqlite:3
-	dev-libs/libxml2
-
-	jingle? ( || ( net-libs/libsoup:2.4[ssl]
-		 >=net-libs/libsoup-2.33.1 ) )
-
-	!<net-im/telepathy-mission-control-5.5.0"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	test? ( >=dev-python/twisted-0.8.2
-		>=dev-python/twisted-words-0.8.2
-		>=dev-python/dbus-python-0.83 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-coding-style-checks \
-		--disable-Werror \
-		$(use_enable jingle file-transfer)
-}
-
-src_test() {
-	# Twisted tests fail, upstream bug #30565
-	emake -C tests check-TESTS
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
index fa4a9395de49..c0c0a8ab61e5 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild,v 1.9 2013/04/01 18:25:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild,v 1.10 2013/05/10 22:07:47 eva Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{5,6,7} )
@@ -27,7 +27,7 @@ RDEPEND=">=dev-libs/glib-2.30:2
 	dev-libs/libxml2
 
 	gnutls? ( >=net-libs/gnutls-2.10.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	!gnutls? ( >=dev-libs/openssl-0.9.8g[-bindist] )
 	jingle? ( || ( net-libs/libsoup:2.4[ssl]
 		>=net-libs/libsoup-2.33.1 )
 		>=net-libs/libnice-0.0.11 )