gentoo resync : 22.06.2019

4 files changed, 2 insertions, 108 deletions

diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index a83b51262921..c6aa387c1ed4 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -1,7 +1,5 @@
-AUX gst-plugins-libnice-0.1.13-gstreamer.patch 1195 BLAKE2B 26ef177454864e7757768cdfb51f8a4dcc450c9dc14c12b53f89950c90f48e4a6fe5774ef5fa456445e144037f332ae8d0fbeba6e92dac85f002c51638afe97d SHA512 fdbeded042b13c33c703a6b5032b7110eb1ce84ec3614e62f6482688a00eece723b4668a1925fcfab645bf61e7fcaf0d4d444525953dae397d8edb9a842c498b
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD gst-plugins-libnice-0.1.13-r100.ebuild 1395 BLAKE2B 4af1c036097bc514547c1b651fa32d9dd8ffd1546f851fd7bb459b8c10c0b9a74b175e0667fd60ead7d83e897901f1d7a5da7bec226f9ca38c081f6b34dd306e SHA512 8961d22ef8d2d8c2522d5047da6dc0f0b602a9b6edad8ad7f563407c99354f1516768d455fb05d386283b1a42869509468c507d2fd5a45a225e390cd7796aa75
-EBUILD gst-plugins-libnice-0.1.13.ebuild 1509 BLAKE2B 3a5f5c651f385a6905d0c7fe7ea3f66f2c0f9a2fe1242cb3e3a7f89fb7d9d659cc82bc77d886b4d0c5e0e1bc371585c277b30a437449556c8da987de5f6613bc SHA512 9a81a4155b6b4f09106250ad899ac99042ccb3cc8388677932d70fd75ad74023792d0bf5d19372359b1f9d7563aa438373474bc8fb98d4d9a45a951281091c8b
-EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1697 BLAKE2B 6406cb733133899eb352b13cc8d508c9fffb508a69724c98a26fbf2942778b75a52d4efbd48c1a6c9c03f073115d3d553cacc8e098a554d927934432d36c2796 SHA512 7955034315f4834dec390c9a8f8311572ac22d194284c94f7c5ac9bf0955a49997c0d446c2d841d027b061d943b256f47b992d24d446afd9ba40eb2d639cdfe4
+EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1696 BLAKE2B c7973c263d1bd3dba83b09923f2856de9cb3ae0ebc534ebac12dee06cdbd098c68da00e2f12873e6c88757b8cda54ea0ac2820281941ce3d9d23e6712de717a5 SHA512 bbdc1cb0ba9198dcfa9e0448990cef824cd3ec747c098f2853cfc01c67c72b6eaa996975be1013de1e7bfbbe0398ef0a2df82ca5df256b575acf77e70c200b10
 MISC metadata.xml 372 BLAKE2B a8206f23c5130a6b0dce3f9e301a998c34401495b4b3fddabc622e99be062815f7174991383f5e4396a345876762f43bb497200496fc778ad45052cd64ed542c SHA512 39d91850c0c10c71afcc7771a7b813080b0a46be31879ab6c33b1b9265d1f85fae78f447b1560e3f3f63b5db78ed30b9d2d7d040d0cc11f31fb5a4398ab3711f
diff --git a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.13-gstreamer.patch b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.13-gstreamer.patch
deleted file mode 100644
index 136d85456c40..000000000000
--- a/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.13-gstreamer.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 76ff4aee9fe963842dd17748d14c68552c5dcda3 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Mon, 1 Jun 2015 16:10:16 +0200
-Subject: [PATCH] configure: Fix configure failure when building without
- gstreamer support
-
-Error introduced in 20ea22e0a11a9bdfe4d8125b68083249b694338a, resulting in a
-configure/build error when building without gstreamer:
-
-configure: error: conditional "HAVE_GST_CHECK" was never defined.
-Usually this means the macro was only invoked conditionally.
----
- configure.ac | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6031cec..64a571f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -231,9 +231,6 @@ AS_IF([test "$with_gstreamer" != no], [
- 		[
- 		have_gst_check=no
- 		])
--
--	AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
--
- ])
- 
- AS_IF([test "$with_gstreamer010" != no], [
-@@ -260,6 +257,7 @@ AC_SUBST(gstplugindir)
- AC_SUBST(gstplugin010dir)
- 
- AM_CONDITIONAL(WITH_GSTREAMER, test "$with_gstreamer" = yes)
-+AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes)
- AM_CONDITIONAL(WITH_GSTREAMER010, test "$with_gstreamer010" = yes)
- 
- GUPNP_IGD_REQUIRED=0.2.4
--- 
-2.4.1
-
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13.ebuild
deleted file mode 100644
index 3d7a8a40163d..000000000000
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib-minimal toolchain-funcs
-
-DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
-HOMEPAGE="https://nice.freedesktop.org/wiki/"
-MY_P=libnice-${PV}
-SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
-SLOT="0.10"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	~net-libs/libnice-${PV}[${MULTILIB_USEDEP}]
-	media-libs/gstreamer:${SLOT}[${MULTILIB_USEDEP}]
-	media-libs/gst-plugins-base:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -e 's:$(top_builddir)/nice/libnice.la:$(NICE_LIBS):' \
-		-i gst/Makefile.{am,in} || die "sed failed"
-
-	# https://bugs.freedesktop.org/show_bug.cgi?id=90801
-	epatch "${FILESDIR}"/${P}-gstreamer.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# gupnp is not used in the gst plugin
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-static-plugins \
-		--with-gstreamer-0.10 \
-		--without-gstreamer \
-		--disable-introspection \
-		--disable-gupnp
-}
-
-multilib_src_compile() {
-	emake -C gst \
-		NICE_LIBS="$($(tc-getPKG_CONFIG) --libs-only-l nice)"
-}
-
-multilib_src_test() {
-	:
-}
-
-multilib_src_install() {
-	emake -C gst DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
index b864bff08dcf..895b8509240d 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="