Version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 187 insertions, 8 deletions

diff --git a/media-plugins/gst-plugins-libnice/ChangeLog b/media-plugins/gst-plugins-libnice/ChangeLog
index ec3f8f347e11..839bd1b4a8ee 100644
--- a/media-plugins/gst-plugins-libnice/ChangeLog
+++ b/media-plugins/gst-plugins-libnice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/gst-plugins-libnice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libnice/ChangeLog,v 1.65 2015/06/07 10:41:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libnice/ChangeLog,v 1.66 2015/06/07 12:29:40 pacho Exp $
+
+*gst-plugins-libnice-0.1.13 (07 Jun 2015)
+*gst-plugins-libnice-0.1.13-r100 (07 Jun 2015)
+
+  07 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gst-plugins-libnice-0.1.13-gstreamer.patch,
+  +gst-plugins-libnice-0.1.13-r100.ebuild, +gst-plugins-libnice-0.1.13.ebuild,
+  metadata.xml:
+  Version bump
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org>
   gst-plugins-libnice-0.1.10.ebuild:
diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index cb42e96d9f23..58a2129d6bb9 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gst-plugins-libnice-0.1.13-gstreamer.patch 1195 SHA256 a100912a30b80257f218e97e5e58af8cb4172fe2563e6512d620ad14b63eedcf SHA512 fdbeded042b13c33c703a6b5032b7110eb1ce84ec3614e62f6482688a00eece723b4668a1925fcfab645bf61e7fcaf0d4d444525953dae397d8edb9a842c498b WHIRLPOOL 856eab907571730aea8977d49c8d0237403952253d7c3d570cdbdbc84d59dc746271db6772b53232a4e4785953e41154893e219f4fa6e1034f753ddef4d33c80
 DIST libnice-0.1.10.tar.gz 903083 SHA256 1dbfb663b730889ae8cab13a2913fe557d581f70b513c918bbbd0b7d3eefebc9 SHA512 2eb6cdd89380c29a23a844d17022b338522ae6a438e9ac018385acb51c2904eccdb0cbfe97a37775182962c003bf6077bee1dde48c7a29963a57564d8c206532 WHIRLPOOL 8450973c2b175a5c3edd99064ee1418f4de2148a02c1501c0fd33cfc6344fa0e187287912f2b447f9fd4be6f1e852ec77e425d7b8d25cee94acb1989933dfb35
+DIST libnice-0.1.13.tar.gz 912374 SHA256 61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1 SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1 WHIRLPOOL 93bd35742cc3ef3cf768613d7757552d7fae98e906cad334b499e3a69577480a840e4e9bdb16c047099a62d47a60e8eee006107b1717937312ada087098f9dad
 DIST libnice-0.1.8.tar.gz 881186 SHA256 9da7f09909902d535389d929c3e4d69129528fb18438a6c8565ec812d9904ddf SHA512 d573810d34a7ca9a5deddc11efa16e66615375fff50f91b406d8e6aa05486253335c35dfd0061ee68ee1c3ccbf9ea6c27225ad452540777c2e0ca0f7fe79d496 WHIRLPOOL c07d1d9d303e95af8d4d7f4fccd53a5fb07cbfbcb72f4364b6d3fb9be451e97f9ad5cb38f71a8c1a16e69302a6427261c3a1b5628423314ddfe126313b49d799
 EBUILD gst-plugins-libnice-0.1.10-r100.ebuild 1535 SHA256 a67435dbea198fa8bf4c4171dedef8351ccc0fdcce6eb01e3da431dfb9c36b3a SHA512 fc93b3ceb8e5c8836b50ebb1d14e2843ef2e8479f9823e3344724a6f0544e346a67497b367625b2447e918d81cd31a0f75d2f47ee66bd6b44a17de12adfaddb9 WHIRLPOOL 7188e68820ea25ef7b07a7051911bd6cf7e70ee4b03a69baa76afeaa9abfa4f4beae0b6e4db5ba9c6bf5f0a7cf4b9a5dc8535933699ca32d8efb0f67ee4f4c4a
 EBUILD gst-plugins-libnice-0.1.10.ebuild 1531 SHA256 744b5bd8fc925c69014051a739f991b27fc243f5620f3deae74cfb1051629011 SHA512 3d7080a0a152b1bef0be00176f00e85616c2811c9839d959d5d46958ef7ad47c02c2eaf9f395a102c8f1437b47891e47e6497e3f6258a5e280a5336b4e3ac5c1 WHIRLPOOL eb9abe3fdb11af34ba5caef48caecedd1f19dc501e93b41a233abb02f0632acccd1eaaa1d62e3590fd38af8f0eddadded1cb4320cb52725ae7b150e6f0787732
+EBUILD gst-plugins-libnice-0.1.13-r100.ebuild 1540 SHA256 19fafb2c43ae2cea41d7917192bf2e777f6865b61a38b30d5c8364e5619f3a71 SHA512 123882436d0107d089a2ec9838ff20d055357ae5da99ba8dc490885bcd445d9b7f74958c3b62c1d3c2fce5c0a7e3087796ecb4548910f2ae8c3e8b40b0d78a74 WHIRLPOOL fca070e8bda8cfc5e105a17b91922a3d7305b7e99854b72c6b8dc544270d90879d9e5e25c4bd539008319d65f21c945892505adc55eed4d7ff2370944d1f5705
+EBUILD gst-plugins-libnice-0.1.13.ebuild 1657 SHA256 dd41e63895047b394cce9c1cf07608567de151bec469b280fd7fc1b986bcc88d SHA512 9a1fb80b8d38cad3395bfe30a998e9133184f2f5b84029c0261f7665ed4734ddf5aa2a5c9b76b2bb4ae70794e841962c607ee659a25c69b67a97697d1719f553 WHIRLPOOL 80879f5a3f9b6a31d685630a8e2a4eabd0510ccf070972f9fe9ebcdf81bc663d4523475b0f0ef7d2344e6034e6a6cd698d773f06ef11b8f4f6de7408801b67ee
 EBUILD gst-plugins-libnice-0.1.8-r100.ebuild 1500 SHA256 4836f5c072232a91532d3e78f9d8c12c7db4c5cf9a59d04899d8e3107b1c778e SHA512 4140ba5a1bc59d5b88de4ff01cdf9e359f606401caa14921d237e1065458149f4e7488dd5a1efca70ce0146d1fe66aeca88da5953041a38bf46d211a38d4c85d WHIRLPOOL c1ec083e163a6a5a6a005170203bf8ae12d38507e1a5ad4c48d9a20b5e3819f46d2c371e409487d1ad59c1e7eb87cfcdb3841aebb2b03902dbb7c2a46d2b85aa
 EBUILD gst-plugins-libnice-0.1.8.ebuild 1496 SHA256 e046d9a2d144bd3375883c35b527a81ab7d1b117ca56363cc8c5a993d6721f61 SHA512 75f90df65dd15e745a4a225a69d63da1bc0c06475a42559a0e4a09e152ae6e61b47bf3ff22e570da16fc13c8cb281420ee3ca296f132b0bed7585a46b8d7710b WHIRLPOOL 28830061a756aec8034fa721e2d979327040c859470bfb5869ffe8f3f3174aec0c4c3b1ebc9991d2fd065323d21aa1962199920270ac94a564b764a5a30be274
-MISC ChangeLog 10488 SHA256 6d06f1aca6607dd78be039197fb6ea207e3901980ff135a19ab2ee66ed8e8622 SHA512 220e7dd9af2d6e23560b40bab20f8425abea12a2f11b434206b417066469a46a3add0b53981d025500941de7168fd842decbe5b993b7be5d0d24f2f704e929e8 WHIRLPOOL f3db851d64fc302fda193d69bcbb466e7bc2c5100fa747e6d861fbd1b09214bd1bdef5dcab22959095d2e52a01e934418e92d488b55e514e11a94fa4fb6ffc57
-MISC metadata.xml 184 SHA256 024e30df6d658d8fd0245d1b05205472624234321924b2bc024f558f1923c492 SHA512 5a2653142a1cb94668474caf75336c48b2feb85e8fd41e18cf441d1bac1f43ca4dfb88d0f87549d8c4f33ec0885f080e627d99abc37ae63827e26e0dd366fdbd WHIRLPOOL cc1cb35bedd7f9847062cebdc4bd2dd348ec1caf039a18b4fc4144b1a655b106b91b0892134e183766ad18f93b9d73ba66ea17b8841875e86b1cd2dcc966d647
+MISC ChangeLog 10787 SHA256 bd9610d748f0d8c71776dec5e523067d6f005ead9c661e035171d2ddc08e28b8 SHA512 2a66d5571474448321063623f2635bd27fbea35a88f15286da01032f44139809c3b957778d257f38f15759be87d3c25a1081bba0ccf91ed5ec24475a7d048a51 WHIRLPOOL a1e2c65dc5bd2289704919318530c42b52d3566fbce5e7ba7c873d1f0a43dda13c51ed6e46041c5cf37da8048f39285568c997b44fe01bf033f7983d18862dc3
+MISC metadata.xml 182 SHA256 ab3201f0c84fb28d439c630d07ba381a9544f5e196f805ad6dfdce0913180887 SHA512 637072cdbb2ae1a42c7fcee7a41b34a0081726c25ec0345b6beac367ed675274502ea004a17a58db1992bb7aa8a6ce058727af3adec2ea4b57b73bb7a49cf022 WHIRLPOOL 15cb224c5e2d4cc574c8db55f8785a56186a808633d5dcab71a075df07f4c2c87ed3c7807e3374121f0bd1fd0c1ca253ebf5470f08fe64085655ae086bd7b814
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV0H+QACgkQkKaRLQcq0GK7KQCgoEAuFfs6yf5PhseR/k3TzqlW
-y8kAn2d4EPWwzCpr+uCcc6s7dJrst0zu
-=H7jV
+iEYEAREIAAYFAlV0OTUACgkQCaWpQKGI+9Q6vgCbBRqZ9VXHnACzovHzO8VT8F7j
+QBEAnis7iBgiHk/YJdjx3cwZkpafrlvf
+=YlxL
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..136d85456c40
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/files/gst-plugins-libnice-0.1.13-gstreamer.patch
@@ -0,0 +1,40 @@
+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-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13-r100.ebuild
new file mode 100644
index 000000000000..32972f2add29
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13-r100.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13-r100.ebuild,v 1.1 2015/06/07 12:29:40 pacho Exp $
+
+EAPI=5
+inherit eutils multilib-minimal toolchain-funcs
+
+DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
+HOMEPAGE="http://nice.freedesktop.org/wiki/"
+MY_P=libnice-${PV}
+SRC_URI="http://nice.freedesktop.org/releases/${MY_P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
+SLOT="1.0"
+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"
+}
+
+multilib_src_configure() {
+	# gupnp is not used in the gst plugin
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-static-plugins \
+		--without-gstreamer-0.10 \
+		--with-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.13.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13.ebuild
new file mode 100644
index 000000000000..644972fb9bed
--- /dev/null
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.13.ebuild,v 1.1 2015/06/07 12:29:40 pacho Exp $
+
+EAPI=5
+inherit autotools eutils multilib-minimal toolchain-funcs
+
+DESCRIPTION="GStreamer plugin for ICE (RFC 5245) support"
+HOMEPAGE="http://nice.freedesktop.org/wiki/"
+MY_P=libnice-${PV}
+SRC_URI="http://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/metadata.xml b/media-plugins/gst-plugins-libnice/metadata.xml
index 4ecaa09dd603..7b258863f92b 100644
--- a/media-plugins/gst-plugins-libnice/metadata.xml
+++ b/media-plugins/gst-plugins-libnice/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>gstreamer</herd>
+<herd>gnome</herd>
+<herd>gstreamer</herd>
 </pkgmetadata>