gentoo resync : 22.06.2019

4 files changed, 2 insertions, 219 deletions

diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 4086c266cd38..0931bd4177cd 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,7 +1,4 @@
-AUX farstream-0.1.2-introspection-tag-order.patch 4840 BLAKE2B 29b1a54b403977a539e9e4fbac73257e8d4e99be49d10eb90948bf6b671ddcd67d6edb228cc3f23f471dde71dbe5af28c606f24fffaeada17bc49ec3bddc95e5 SHA512 a0fddf3dbbee8dd89ef05fe4df1c3c76fd6f4750d9b6aa8287691e51adc97b4e52e5bc84995918e526ebe44f61c099aa4b1f443d56da5978b6a8b88aa6e98bf9
-DIST farstream-0.1.2.tar.gz 1265972 BLAKE2B 239deea639f3456170aee1633d0ec08569174e1919b78d6529a5a8c9672cbe95074a282fc8632069ea90eaa9b4fd13714be117ea66d368e69eca785ce796a15a SHA512 7d9ddde5d17205752a17298fb90cf855a828b2ae58746fbdc7e47749cee5e5eac4fd56f97f58251a5d253901cdd555e9cfade6016b6d92df99daefbe850e2910
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
-EBUILD farstream-0.1.2-r2.ebuild 2374 BLAKE2B c4832a241cce39990bc5a396503cb29090a67799edb33018d2f25a8fee56eb77b9ffa17a04b05ec608dc28cc90382fd7f2620924bd1b506ffd8273f9a5c0bf15 SHA512 1222e9257b9ac280dd94b1e2f75f12369db67ae8efbce4ab6403404b37e60b63de9c06c797eb716ea8150c642cf323153e7ee4a1e246ff51b9a5de69e76ca56c
 EBUILD farstream-0.2.8-r1.ebuild 1823 BLAKE2B ec2e9332008aff2e2b510a473addfc3d424152b25045714544a2b12d6bec84df95e82869a076ca6c0eaa8461ea1f1cf897e814ea817b3e2e74b30371be91e144 SHA512 11cdf3f595e40cd4dd6fd328313e4f8696a82f86083f9944ec60e25e68389aae8e54b7791b83cf7638becf92e1cf00badcbe5d669feb70412ecd1520528ac65f
-EBUILD farstream-0.2.8-r2.ebuild 1864 BLAKE2B 273cc39ecebb0c8c440f5a76663bb23880ecb8f5012a89d48538f6633f9780168c5421b56ff7ff1d18a1372ea4387759df55f06d2313181cc2d34d039a179fcf SHA512 1d3380e2063ce247fab29402b4cda284b18f1662bf74949f2e5ecbcc173a9d5480cf4443511faa91402e10f040dd29485d1504a52a1965712d39e30e99248f05
+EBUILD farstream-0.2.8-r2.ebuild 1863 BLAKE2B a5a55b2a43826d54039054763bee6f82925f18c6efdaf05e90f1fb283a13dc5031e6d8bef4c1dd1f855e0f062a45b75c20e86a3cd052f2c8eaba62cac44999bc SHA512 c8def848ed3ebfca720ad035aa7ac9d7951415bc15932fd6bde32ce0f7e70fb68ffef840b299dc172ec4c71c8ea2c11e2c54afff17b0d477169463518017ab42
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.1.2-r2.ebuild b/net-libs/farstream/farstream-0.1.2-r2.ebuild
deleted file mode 100644
index fd42212ec0f7..000000000000
--- a/net-libs/farstream/farstream-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
-SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="+introspection python test upnp"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-SLOT="0.1"
-
-# Tests need shmsink from gst-plugins-bad, which isn't packaged
-RESTRICT="test"
-
-COMMONDEPEND="
-	>=media-libs/gstreamer-0.10.33:0.10
-	>=media-libs/gst-plugins-base-0.10.33:0.10
-	>=dev-libs/glib-2.30:2
-	>=net-libs/libnice-0.1.0
-	introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
-		>=dev-python/gst-python-0.10.10:0.10[${PYTHON_USEDEP}] )
-	upnp? ( net-libs/gupnp-igd )
-"
-RDEPEND="${COMMONDEPEND}
-	>=media-libs/gst-plugins-good-0.10.17:0.10
-	>=media-libs/gst-plugins-bad-0.10.17:0.10
-	>=media-plugins/gst-plugins-libnice-0.1.0:0.10
-	!net-libs/farsight2
-"
-# This package is just a rename from farsight2
-
-MAKEOPTS="${MAKEOPTS} -j1" # Parallel is completely broken on this slot, bug #434618
-
-DEPEND="${COMMONDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? (
-		media-libs/gst-plugins-good:0.10
-		media-plugins/gst-plugins-vorbis:0.10 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# FIXME: do an out-of-tree build for tests if USE=-msn
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix building with gobject-introspection-1.33.x, bug #425096
-	epatch "${FILESDIR}/${P}-introspection-tag-order.patch"
-}
-
-src_configure() {
-	plugins="fsrawconference,fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
-	econf --disable-static \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable upnp gupnp) \
-		--with-plugins=${plugins}
-}
-
-src_install() {
-	# Parallel install fails, bug #434618 (fixed in latest slot)
-	emake -j1 install DESTDIR="${D}"
-	dodoc AUTHORS README ChangeLog
-
-	# Remove .la files since static libs are no longer being installed
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index a6d6e87d72d1..66460a2d096f 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch b/net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch
deleted file mode 100644
index 3283e1fd2990..000000000000
--- a/net-libs/farstream/files/farstream-0.1.2-introspection-tag-order.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 39450457190675716c8e66700e35b05334a6a1a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Fri, 25 May 2012 17:06:59 -0400
-Subject: [PATCH] Gtk-doc tags belong after the description
-
----
- farstream/fs-session.c |   16 +++++++---------
- farstream/fs-stream.c  |   15 ++++++---------
- 2 files changed, 13 insertions(+), 18 deletions(-)
-
-diff --git a/farstream/fs-session.c b/farstream/fs-session.c
-index 80794d1..abb1bc3 100644
---- a/farstream/fs-session.c
-+++ b/farstream/fs-session.c
-@@ -270,9 +270,6 @@ fs_session_class_init (FsSessionClass *klass)
-   /**
-    * FsSession:codec-preferences:
-    *
--   * Type: GLib.List(FsCodec)
--   * Transfer: full
--   *
-    * This is the current preferences list for the local codecs. It is
-    * set by the user to specify the codec options and priorities. The user may
-    * change its value with fs_session_set_codec_preferences() at any time
-@@ -283,6 +280,9 @@ fs_session_class_init (FsSessionClass *klass)
-    * or %FS_CODEC_ID_ANY. If the encoding name is "reserve-pt", then the
-    * payload type of the codec will be "reserved" and not be used by any
-    * dynamically assigned payload type.
-+   *
-+   * Type: GLib.List(FsCodec)
-+   * Transfer: full
-    */
-   g_object_class_install_property (gobject_class,
-       PROP_CODEC_PREFERENCES,
-@@ -296,9 +296,6 @@ fs_session_class_init (FsSessionClass *klass)
-   /**
-    * FsSession:codecs:
-    *
--   * Type: GLib.List(FsCodec)
--   * Transfer: full
--   *
-    * This is the list of codecs used for this session. It will include the
-    * codecs and payload type used to receive media on this session. It will
-    * also include any configuration parameter that must be transmitted reliably
-@@ -317,6 +314,8 @@ fs_session_class_init (FsSessionClass *klass)
-    * It is a #GList of #FsCodec. User must free this codec list using
-    * fs_codec_list_destroy() when done.
-    *
-+   * Type: GLib.List(FsCodec)
-+   * Transfer: full
-    */
-   g_object_class_install_property (gobject_class,
-       PROP_CODECS,
-@@ -329,9 +328,6 @@ fs_session_class_init (FsSessionClass *klass)
-   /**
-    * FsSession:codecs-without-config:
-    *
--   * Type: GLib.List(FsCodec)
--   * Transfer: full
--   *
-    * This is the same list of codecs as #FsSession:codecs without
-    * the configuration information that describes the data sent. It is suitable
-    * for configurations where a list of codecs is shared by many senders.
-@@ -349,6 +345,8 @@ fs_session_class_init (FsSessionClass *klass)
-    * It is a #GList of #FsCodec. User must free this codec list using
-    * fs_codec_list_destroy() when done.
-    *
-+   * Type: GLib.List(FsCodec)
-+   * Transfer: full
-    */
-   g_object_class_install_property (gobject_class,
-       PROP_CODECS_WITHOUT_CONFIG,
-diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
-index b9e1320..110641d 100644
---- a/farstream/fs-stream.c
-+++ b/farstream/fs-stream.c
-@@ -176,13 +176,12 @@ fs_stream_class_init (FsStreamClass *klass)
-   /**
-    * FsStream:remote-codecs:
-    *
--   * Type: GLib.List(FsCodec)
--   * Transfer: full
--   *
-    * This is the list of remote codecs for this stream. They must be set by the
-    * user as soon as they are known using fs_stream_set_remote_codecs()
-    * (generally through external signaling). It is a #GList of #FsCodec.
-    *
-+   * Type: GLib.List(FsCodec)
-+   * Transfer: full
-    */
-   g_object_class_install_property (gobject_class,
-       PROP_REMOTE_CODECS,
-@@ -195,15 +194,14 @@ fs_stream_class_init (FsStreamClass *klass)
-   /**
-    * FsStream:negotiated-codecs:
-    *
--   * Type: GLib.List(FsCodec)
--   * Transfer: full
--   *
-    * This is the list of negotiatied codecs, it is the same list as the list
-    * of #FsCodec from the parent #FsSession, except that the codec config data
-    * has been replaced with the data from the remote codecs for this stream.
-    * This is the list of #FsCodec used to receive data from this stream.
-    * It is a #GList of #FsCodec.
-    *
-+   * Type: GLib.List(FsCodec)
-+   * Transfer: full
-    */
-   g_object_class_install_property (gobject_class,
-       PROP_NEGOTIATED_CODECS,
-@@ -216,9 +214,6 @@ fs_stream_class_init (FsStreamClass *klass)
-   /**
-    * FsStream:current-recv-codecs:
-    *
--   * Type: GLib.List(FsCodec)
--   * Transfer: full
--   *
-    * This is the list of codecs that have been received by this stream.
-    * The user must free the list if fs_codec_list_destroy().
-    * The "farstream-recv-codecs-changed" message is send on the #GstBus
-@@ -228,6 +223,8 @@ fs_stream_class_init (FsStreamClass *klass)
-    * also be emitted if the pad already exists, but the source material that
-    * will come to it is different.
-    *
-+   * Type: GLib.List(FsCodec)
-+   * Transfer: full
-    */
-   g_object_class_install_property (gobject_class,
-       PROP_CURRENT_RECV_CODECS,
--- 
-1.7.8.6
-