gentoo resync : 28.04.2019

3 files changed, 2 insertions, 94 deletions

diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest
index 19af357898cb..a3433aa6b2ed 100644
--- a/net-voip/telepathy-gabble/Manifest
+++ b/net-voip/telepathy-gabble/Manifest
@@ -1,6 +1,5 @@
 AUX telepathy-gabble-0.18.4-build-fix-no-jingle.patch 774 BLAKE2B 3a861c8f32d0900003b7553f70144f261bf45f33dd2cfffb54d1a0bbc00a1f99961180d8f848d4e1cf70deee46e9a66fd56af6cc6196787fa4265bbd46034a35 SHA512 e1d2dc3b13ebfb24dab5c73ba9dd930f1ff61a443311dbfb3526a3474bfba96934b24e48c8b098216e8c205c4835143c891697c23b328a6541a72683d4864e11
 AUX telepathy-gabble-0.18.4-openssl-1.1.patch 8670 BLAKE2B 1d7f3133a67b4f17acbbbad0e1ba45421c9d3bbaa7bab4cdc1cffdadaff6a839b197f8b2167c5bb77fef80a68fea6c214fe0fb6b348c06a2a84a020d0d5f4cfe SHA512 f3d5f4aa15efe17a408888a51a5670e512cf3264261b1a11bada080b15ec131c42f222fe9fe9660717d32208988383a75214908adc6e364d4a8903b7ef0f3d2c
 DIST telepathy-gabble-0.18.4.tar.gz 2584311 BLAKE2B c1708be2ebe0b7dd06b53af1087c349e1a1f0b83dfffe463c72e31e459d2efd4db5bad7ade7a478bd4b91948aade822bfa6c13fe175863759cc98c44beca8178 SHA512 4303f1da7eeadf1f0e69fa881cd8b08dc41f4fd061df3f2ecdc80735d8be3e8cf24d8482f265f1858d8dfed71f62e8bc02c13f9525db8d21c9d927e25fa66218
-EBUILD telepathy-gabble-0.18.4-r1.ebuild 2489 BLAKE2B 3a28467ab60fceaa99ccc097b9b84f3ffcb98c87d11554083259d17d0acdfcf3c37592cf50f7c159f50a4d37d511717d79c9e22a8c49467937bbd21e35e1a2f9 SHA512 89b07c942e30c5bfd5852ebf9fef176026339dc65465d517478a7a2ac6ce1e01420115495bf0964fcf338b05ffeb63991ed2b8c7feda1305b40ee95aa1e6c640
-EBUILD telepathy-gabble-0.18.4.ebuild 2449 BLAKE2B 43d5d21ee7b6716e9fffc8c4eca06578be9ebe23ebe1804439bce5a502897483ce55c83d317a7e848cef348f15c3edb1ad6e2120a90a9b1f29d78da7d991c9c2 SHA512 cf14ddb0c942661c3df4f725ec4e2926782f733e06574ca6432c9c7bd77bac4c6c1eba954fcd534f373ec19e6448b5f7244c402c8ba6e8995ce6d900c82db7cf
+EBUILD telepathy-gabble-0.18.4-r1.ebuild 2496 BLAKE2B 2a64654f0db188635b2329b5d8e2a62ecff2e2603cde3adca821c4dd6b32aa911341c062f87a52593ac92be91491bc00e8410b2c02b6e9fc8fef6a95b14a95d2 SHA512 70c566c19547414771217c92b88d8e0f5aeea1ada03f3bdbcd05c0143cc39155d7ad7bf8612ac90f3abd413aacaf8cd75c76e4e69ad47b1e9b1e61566a6ff697
 MISC metadata.xml 314 BLAKE2B a60cf9d111fe68b5946ddc21003298134c31a442c103684cccc1c5b3034d13d3cedee78e8144f1ea1c499cfff62030861798b9397bbba0312ef9103243d90eb3 SHA512 ba54eb3b051b150337d298257eed95007ac3f27ac94850dd7c6b5d4a16014cc89ee08477e4e76e3220e003d6d3c705a7c71aeb9f80e4324df62218eb16e69297
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild
index 3cab079d96fa..1be39825cb65 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r1.ebuild
@@ -13,7 +13,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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="gnutls +jingle libressl plugins test"
 
 # Prevent false positives due nested configure
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild
deleted file mode 100644
index b3ef53e976bd..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# Python is used during build for some scripted source files generation (and twisted tests)
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="A XMPP connection manager, handles single and multi user chats and voice calls"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-IUSE="gnutls +jingle libressl plugins test"
-
-# Prevent false positives due nested configure
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: missing sasl-2 for tests ? (automagic)
-# missing libiphb for wocky ?
-# x11-libs/gtksourceview:3.0 needed by telepathy-gabble-xmpp-console, bug #495184
-# Keep in mind some deps or higher minimum versions are in ext/wocky/configure.ac
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=sys-apps/dbus-1.1.0
-	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.19.9
-
-	dev-libs/libxml2
-	dev-db/sqlite:3
-
-	gnutls? ( >=net-libs/gnutls-2.10.2 )
-	!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 )
-	plugins? ( x11-libs/gtksourceview:3.0[introspection] )
-
-	!<net-im/telepathy-mission-control-5.5.0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.17
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-# Twisted tests fail if bad ipv6 setup, upstream bug #30565
-# Random twisted tests fail with org.freedesktop.DBus.Error.NoReply for some reason
-# pygobject:2 is needed by twisted-17 for gtk2reactor usage by gabble
-#test? (
-#	dev-python/pygobject:2
-#	|| (
-#	>=dev-python/twisted-16.0.0
-#	(	>=dev-python/twisted-core-0.8.2
-#		>=dev-python/twisted-words-0.8.2
-#		>=dev-python/dbus-python-0.83
-#	) )
-#)
-
-PATCHES=(
-	# Fix build with USE=-jingle, bug #523230
-	"${FILESDIR}"/${P}-build-fix-no-jingle.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-coding-style-checks \
-		--disable-static \
-		--disable-Werror \
-		--enable-file-transfer \
-		$(use_enable jingle voip) \
-		$(use_enable jingle google-relay) \
-		$(use_enable plugins) \
-		--with-tls=$(usex gnutls gnutls openssl)
-}
-
-src_test() {
-	# This runs only C tests (see tests/README):
-	emake -C tests check-TESTS
-}