Version bump

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 178 insertions, 3 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/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>