Fix

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 12 insertions, 84 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/Manifest b/net-voip/telepathy-gabble/Manifest
index 40d42c599885..fc9c5ce16063 100644
--- a/net-voip/telepathy-gabble/Manifest
+++ b/net-voip/telepathy-gabble/Manifest
@@ -1,26 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST telepathy-gabble-0.16.1.tar.gz 2644994 SHA256 77536d0ca6c040f1b1bd46c6f5914d0677a6dc6ecf1e858816c24fcf07e3f310 SHA512 5497953d6332678d78357ebb1a1e308361b947f35c130301f8c839ae31acf2ccebecef5df44bdf59b1690f97f9cad122b0811cf7bc27ec68fb959cfa1a42d09a WHIRLPOOL eab35682350360d08c659adaf26cca60fca4d68e0c5cce7fa559b563240a48eb473d2d5976148b01048cedc0b498a90ed9de1875f0c547fed285d8c9b5910ef4
 DIST telepathy-gabble-0.16.4.tar.gz 2634499 SHA256 e5321c1589db9bc306acfcff3f6e4f75a3b58351e68c772d3616ccf6f3c8d213 SHA512 0715103b4be1f5080950d85825f2de14d3e88908e1b276ba85408daee70f269230ffae401bd6fe039ec899fa0d6f418f80eda3ba78a817278ef45e4ca2ea7070 WHIRLPOOL 7424c1cc9ed2c019692448e851464e1d63ebb39ceeb2319cf4c446f810f4fc5034ddee58e339a9b171f2c84e367fa7e8c629c4cbb745e1fc7d2a98f4f7d19eeb
-EBUILD telepathy-gabble-0.16.1.ebuild 1510 SHA256 3ff76e93c078a960417aad61fa7a207b8e4898399159554c2f67a5ddf3ff9047 SHA512 8afe1579960c31e6c0dd2c20c56ed8f83a9e9f5c03a821e10c9ce0be7199fbe4b3b7f92074db9ad8a336913a688f1b938e8954793ccc5046c6e08cfeddcb3400 WHIRLPOOL 244670156735b08c0aa3e63d3cef51692e0ab2724a081dd671e92b4aa33c91d1ad3e7ded02acbc35748cd5bcf368fafbfdf6cade1dd0c9561ccb1d5a3392ac7a
-EBUILD telepathy-gabble-0.16.4.ebuild 1810 SHA256 a9636651e8bdeab0975c80eae31b198c152f3477cad4136193241cdcf8ae867a SHA512 4741c343d931afa1de11878586e1051e9cb358b9db52c041e5d16206f44debfe34f4083a4e4014d3d8f4a96eacc79ef94c1a7b49b46bb944ba299e2d7c563abd WHIRLPOOL 23cf406d77d27988f68a8dfc94301d18bff73aa12b21c32aa566db7f88b0b3485161de83cd04db4a028a467ec9f8f7d65f4e16ce7b97bf358e72f8f8acf2538b
-MISC ChangeLog 19339 SHA256 f06e0a7dc184fe666468c77e7e83b8966c5262f22a2db331c6975ada46370a58 SHA512 9a890c0b2b1e84671f1d087e57f15ddd443ccfadd2aa8f3c3bcad643f9f7d77a66319d8ceb6565d46a42d22a44fe90766b6b2cb614edd6f3c9ce0e0edd240ab6 WHIRLPOOL 7a916068a6e93418b9320aaeed46670b8137a034637172f0e5c425615c2f075ab255ad8e0299a79ed275f9a6bd562066b7281a61b0ef3a6ddf3205fd6fad79b6
+EBUILD telepathy-gabble-0.16.4.ebuild 1821 SHA256 04a9b23189da3ba8dd222bfdcae76ef2e24407b3d167892b9d01c21faef5d582 SHA512 78e3e04b82121fc995cd7d0df9762ee04120e8e3c6065494ebb67700c95c503d911c2f082b53179d134cf2305fddcda05271e259e27994e7413b43d1cec0dbb1 WHIRLPOOL a3528b84ecd49cac77c20718846eb0b142dd3e434dca36dc62cfeae320b885d9ee174aa5e798118f8ee9680e25c3ff02e98c2f8ef510dbbde296840c9c5f5993
+MISC ChangeLog 19502 SHA256 992659c97f7471554267e39ac3149fe36655cdab2788f2e29429ed84f9e1ee0f SHA512 ed7ab28ca7e43559ed5c5d56b0e26212ad751340cd8e60a806071dd6818c2bc16508f2b21bc59a7bf0c57ab454218ca3bfabf87aa27bfed2ecd42b4eef3dd07a WHIRLPOOL 6fd3535b36dbea98ba90f25e28a3e3d1f95eb19de3a9fdb70287584e4230141d708358d6b14bc53a3d0f869c1d1b7c93afbfd67490ec86084b733f388b41411f
 MISC metadata.xml 325 SHA256 ff2e73c08bb9d36afaab8b340aec6d62b22a1f2470953444c2ca101d652380c0 SHA512 40b693eb958f6d44040e96e09e3d34ee7f2cf5ffe2271c95baf1005e7d0cd52c01d43f87a04c313b8cce94b9bcee971d82eba0be6cf4f21f35b8b9586be8652b WHIRLPOOL fbe47a1f5fc725481c50c2f2d312e1469930d59d2dc4af965a7a80ce5dd55476dc7c4e299f0dbb0115d83d20231b5d302866ac09a5056648d60f2bd2bbe02a6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRWdEiAAoJELp701BxlEWfULkP/Ru7GnXqJ3bOKkhE3cb+dDJH
-9Yec13qM6DEAXuufwxcLFBlVvsnTKTTcQmseC3lxnZfNa+uz3wpgSh7uvPG4uZHe
-Uht0AzWUr+d76O0cUqxVH+UlFJCM1IQePPuqgxo3hgDcCwO1tQ+2uO3LRcVrHRrr
-whYccok4o6bOsVmUT2fdlIb7sToetPHAtbk3NOU/MrEUMnxYKjN3i/07w43AJO2A
-R/NIPs1Zw9PUcAY9rm3cWF3r6Ci1CjzqckLM3sSaN20pUdjOaSA0fLV+tmdRO5hf
-U4gN4oVK1tDBJtk8xvfYy19rPXQmcojU4skFWFkWLE4RY6O+/FYoV+eTxOUKT8CX
-F0RJ9gAwk0M324QS/ZBPPbnyKi6UINOhDBOrV6fLOdjD09PjwdAgGfRaZte4UTnq
-PACO7V3078A6D0wq+sMJaxR578Hua9/OXf7/4Mv0qgg9Ez4DcscgJd2UdOJN8Be7
-XyoCMcBtj1LC/0qP7nd37AmUbkL8OQSUeSMJSTlwcc8t7IpQbEXBMdwBgDiHru9F
-0byk4OPjXUE1itcP50Mmzr8CqpsS1xO92OFWlaqzIFQ7/SxVf5szrNlyjKmMJz3/
-X1LUaxh4mfmYLzofxUFiPEq7ZlersW6UdM/JGCCy3pOcZ+cgPWUf90BeIR/AhaHM
-eFajNUKgp/ykfhLH5+eA
-=DkxG
+iEYEAREIAAYFAlGNb7QACgkQ1fmVwcYIWAa7VACfQpYvLygSnhFbcVHwJoy+iDuM
+jdUAoOBo0bSBR45cHqpwVmgUwy8MrPau
+=5qwf
 -----END PGP SIGNATURE-----
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 )