From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- net-voip/telepathy-gabble/Manifest | 2 +- net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'net-voip/telepathy-gabble') diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest index bf3c4e014518..baf0bd96ef0a 100644 --- a/net-voip/telepathy-gabble/Manifest +++ b/net-voip/telepathy-gabble/Manifest @@ -1,4 +1,4 @@ AUX telepathy-gabble-0.18.4-build-fix-no-jingle.patch 774 BLAKE2B 3a861c8f32d0900003b7553f70144f261bf45f33dd2cfffb54d1a0bbc00a1f99961180d8f848d4e1cf70deee46e9a66fd56af6cc6196787fa4265bbd46034a35 SHA512 e1d2dc3b13ebfb24dab5c73ba9dd930f1ff61a443311dbfb3526a3474bfba96934b24e48c8b098216e8c205c4835143c891697c23b328a6541a72683d4864e11 DIST telepathy-gabble-0.18.4.tar.gz 2584311 BLAKE2B c1708be2ebe0b7dd06b53af1087c349e1a1f0b83dfffe463c72e31e459d2efd4db5bad7ade7a478bd4b91948aade822bfa6c13fe175863759cc98c44beca8178 SHA512 4303f1da7eeadf1f0e69fa881cd8b08dc41f4fd061df3f2ecdc80735d8be3e8cf24d8482f265f1858d8dfed71f62e8bc02c13f9525db8d21c9d927e25fa66218 -EBUILD telepathy-gabble-0.18.4.ebuild 2361 BLAKE2B 5e13132582200fba38afceb1a3d2584442863f8509dc46066d8725a3d4781ae2e1c2eff579231a2beda0b31287789b6996cda3a5ecde89fb9ea591bad364b10e SHA512 c0ce651f7b71ceb6fdd908e73b65e42585929b384dec7fb1abdc4ccf65f8eb9ddf375089453e8de1ba3cddf04817f0823d9e76b20982633baa56d6e67af9b80b +EBUILD telepathy-gabble-0.18.4.ebuild 2424 BLAKE2B 5fb908424ac680641db9025af75995b9bf30a59a091c5285bfc3010409c0614aac053760ac3c35e04ca81e271e8b7c35636d6061dac1a5a101cd5dc4de67f585 SHA512 79029fb1cc2ee965b5124ef4c05b3e2e7c44f01bb2c95d73238bcdf8d3d353d3cb54b4145a451025bc4e889a0b3a5c4935067783461d4573e21938e6e04ac6f8 MISC metadata.xml 314 BLAKE2B a60cf9d111fe68b5946ddc21003298134c31a442c103684cccc1c5b3034d13d3cedee78e8144f1ea1c499cfff62030861798b9397bbba0312ef9103243d90eb3 SHA512 ba54eb3b051b150337d298257eed95007ac3f27ac94850dd7c6b5d4a16014cc89ee08477e4e76e3220e003d6d3c705a7c71aeb9f80e4324df62218eb16e69297 diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild index b6a3ce07eea8..b20b0f2d4ecb 100644 --- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild +++ b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 # Python is used during build for some scripted source files generation (and twisted tests) PYTHON_COMPAT=( python2_7 ) @@ -14,7 +14,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux" -IUSE="gnutls +jingle plugins test" +IUSE="gnutls +jingle libressl plugins test" # Prevent false positives due nested configure QA_CONFIGURE_OPTIONS=".*" @@ -33,7 +33,10 @@ RDEPEND=" dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) - !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] ) + !gnutls? ( + libressl? ( dev-libs/libressl:0= ) + !libressl? ( >=dev-libs/openssl-0.9.8g:0=[-bindist] ) + ) jingle? ( >=net-libs/libsoup-2.42 >=net-libs/libnice-0.0.11 ) -- cgit v1.2.3