Fix

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

3 files changed, 7 insertions, 65 deletions

diff --git a/net-voip/telepathy-salut/ChangeLog b/net-voip/telepathy-salut/ChangeLog
index 12943886ee9e..cb98f465d530 100644
--- a/net-voip/telepathy-salut/ChangeLog
+++ b/net-voip/telepathy-salut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-voip/telepathy-salut
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/ChangeLog,v 1.55 2013/04/01 18:25:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/ChangeLog,v 1.56 2013/05/10 22:08:59 eva Exp $
+
+  10 May 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -telepathy-salut-0.8.0.ebuild, telepathy-salut-0.8.1.ebuild:
+  Fix openssl requirements, bug #460456.
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> telepathy-salut-0.8.1.ebuild:
   Stable for sparc, wrt bug #458984
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.0.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.0.ebuild
deleted file mode 100644
index b5af5fa63db5..000000000000
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.0.ebuild
+++ /dev/null
@@ -1,62 +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-salut/telepathy-salut-0.8.0.ebuild,v 1.7 2012/10/28 16:30:59 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-
-inherit base python eutils
-
-DESCRIPTION="A link-local XMPP connection manager for Telepathy"
-HOMEPAGE="http://telepathy.freedesktop.org/wiki/CategorySalut"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-libs/libxml2
-	>=dev-libs/glib-2.24:2
-	>=sys-apps/dbus-1.1.0
-	>=net-libs/telepathy-glib-0.17.1
-	>=net-dns/avahi-0.6.22[dbus]
-	net-libs/libsoup:2.4
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-libs/check-0.9.4
-		net-libs/libgsasl
-		dev-python/twisted-words )
-	dev-libs/libxslt
-	virtual/pkgconfig"
-# FIXME: needs xmppstream python module
-#               >=net-dns/avahi-0.6.22[python]
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix uninitialized variable, upstream bug #37701
-	epatch "${FILESDIR}/${PN}-0.5.0-uninitialized.patch"
-
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	econf \
-		--disable-plugins \
-		--disable-Werror \
-		--disable-static \
-		--disable-avahi-tests \
-		--docdir=/usr/share/doc/${PF}
-		#$(use_enable test avahi-tests)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
index 4718bc23285f..7d4c9e8ea891 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1.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-salut/telepathy-salut-0.8.1.ebuild,v 1.11 2013/04/01 18:25:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild,v 1.12 2013/05/10 22:08:59 eva Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{5,6,7} )
@@ -26,7 +26,7 @@ RDEPEND="
 	net-libs/libsoup:2.4
 	sys-apps/util-linux
 	gnutls? ( >=net-libs/gnutls-2.10.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	!gnutls? ( >=dev-libs/openssl-0.9.8g[-bindist] )
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}