Add farstream-0.2.2 with gstreamer-1.0 support (bug #436238), parallel-installable with the 0.1 versions.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 94 insertions, 13 deletions

diff --git a/net-libs/farstream/ChangeLog b/net-libs/farstream/ChangeLog
index 07620014b73f..75cf5ace6f01 100644
--- a/net-libs/farstream/ChangeLog
+++ b/net-libs/farstream/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/farstream
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/ChangeLog,v 1.14 2012/12/08 00:58:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/ChangeLog,v 1.15 2012/12/08 01:23:36 tetromino Exp $
+
+*farstream-0.2.2 (08 Dec 2012)
+
+  08 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  farstream-0.1.2-r1.ebuild, +farstream-0.2.2.ebuild:
+  Add farstream-0.2.2 with gstreamer-1.0 support (bug #436238),
+  parallel-installable with the 0.1 versions.
 
   08 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   farstream-0.1.2-r1.ebuild:
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 59dc6c3e49b1..90f7614f5cd2 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,17 +3,19 @@ Hash: SHA256
 
 AUX farstream-0.1.2-introspection-tag-order.patch 4840 SHA256 f540ea6f239e291f9ffc5b806cfea9f9cd0c4f13963e900719a5ee3a3f370124 SHA512 a0fddf3dbbee8dd89ef05fe4df1c3c76fd6f4750d9b6aa8287691e51adc97b4e52e5bc84995918e526ebe44f61c099aa4b1f443d56da5978b6a8b88aa6e98bf9 WHIRLPOOL 03dc7a3a6285214b20833fd89de341e1f4235e01893eccbe8db0ce4cbf55e670309d6cfa22df8d13baff10e0c19058b7c76523f4b56c4c6d793ce85ab446ea6f
 DIST farstream-0.1.2.tar.gz 1265972 SHA256 fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9 SHA512 7d9ddde5d17205752a17298fb90cf855a828b2ae58746fbdc7e47749cee5e5eac4fd56f97f58251a5d253901cdd555e9cfade6016b6d92df99daefbe850e2910 WHIRLPOOL 273d20082152ff09adf8e64481b1b7c7ba7e6a24fc09addc219880fbee7f1e6b9845ce727c032fa3c364e8d2440736fd0324015426591b7e9766f11054828294
-EBUILD farstream-0.1.2-r1.ebuild 2424 SHA256 8bfc631e46e8d8466a947eb21a7de48eff7580aad12bbe1d6dcd6b9d327dee92 SHA512 ae92bd08ccbc95834513dffa6157fa8a4b9eb7cd8cbc7062e8fc8f26ade1d7649a1353838ebe075daf6c5d28aece4eada69643e067a8e90dd12dcefbf31f682a WHIRLPOOL dce402990bfce92f8bca6f309a934b490e5d7a7b048be2203bab10b864f99dfabf5158c09b0197e71245b5f952784b0b7c06aef8a7f64c506c52d690592ea7b0
-MISC ChangeLog 2173 SHA256 a7b3590789dba32ffb0a411953fe76a4960b1c065fb01da0b53c6585ac83848b SHA512 c227f9cf66a08c3b7e1bbaf815469c431d244a5ac17045998a20e213a896670658b19b19ce81ff9c491f5713b68f6b99653af2f65b8d4b76e58116d63d1fcafb WHIRLPOOL 520b795b0d4e2fe0f7de39e3e718a99becdadd282990d068b05b93675ebf67a354ad47c76bb0cf7ff1bb5853b2f4f39da8fb15387562b9d4ac1cb85b9190abbc
+DIST farstream-0.2.2.tar.gz 1246020 SHA256 ffd3c536372781713956eeb28644a6e9ee6e3bab034bee65af6bbb61213cb080 SHA512 0675334c56c82d9298dadeb7d140e74bdcb4176403ece8bcb73adba8c9f119097d623c8df5ac88a75343e3ed84d7284b6304643e3c1ea022bfcde6f16d12de3a WHIRLPOOL 9c531bc40665fd1da1260697290e8884149fd98eae8fe0e679d1241b1a646cb8ace94fd2c11011a491e19b21346e0bb3a9aa31f181341159151cfbc24c63958d
+EBUILD farstream-0.1.2-r1.ebuild 2447 SHA256 8595757c70e57e9968db7a8264e08607e6c8e432f95f88a029e3e5e6d61081d3 SHA512 ec9d6ca8fafbf2f4b1b615608ab03a3fa26be49924c1ad71692e1f27e3ad411b368d0869304de65ee638f25565afdd0a0c5ddc9ad0373a37390b4a20a20aecef WHIRLPOOL 3ff197808da2ad96880263233e1fd4f98c0f1adba7bde72abdbc23c3990b5d478dd1bb78f6d5bf8c8f0fe810160f2379a1d5be20c7c3fe9639199f80a713425a
+EBUILD farstream-0.2.2.ebuild 1929 SHA256 43ca7c44763f008d69254cbb34f1ef58fabeeed02784745d0e06fce3b52681fd SHA512 bb4a9dce67561033ed7152011512adf8a6d03a0b44cd503eed16881c7fe6e4d0cba1566c888013176f56827fc0195b7ff67699ef88d04a06be5e7f213129b172 WHIRLPOOL 65f30091989377ae43bbc8d8efe480cf74c1eead20017e8165bba0eb4204473645c133917c30424c3a9b3f9209a366fa1b1ef55320e52af46d57abd46e04d9c4
+MISC ChangeLog 2429 SHA256 f250c3e0aae6bbd4db7a8cfa31eed4583fe4a341d631e1ba8fc00ea0c3b33b83 SHA512 3e1c8483d958e3266cd0abe519f13a98abca5670d19a2cec04b9e1dae33c3d9d8a1311f3abc92041ea120ef26db5aa52d6bef8d62eb2f46a363b172b08af604f WHIRLPOOL 1b653113938856689d9f8329e43ca2fc5c7ecfebbe7f0c8ab954284242131e9f0b8fa1e324730d738522ecd7a1ec0d4bb1cce84cd245f90c1db52afe191f18fa
 MISC metadata.xml 348 SHA256 5f6a8590ed09ad86cf62d3d10102e8651c76c26895846a20b7bff8ac7b9c4506 SHA512 837ff605fd5eb5cf682c29feae7186372c169a3a17dd48f9a66503d81ba071efc1593153537099532706aa46bc8ba820ab8493f34ebac4966e7e395c93395b7d WHIRLPOOL 532d00407295188f922e8f9361eeb1603a486671fedd04560cfb33135b97b6dd73bc259c435be765daa7f658c04fb5d385ac6a423022d2418cf45a9fd195ff65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQwpDEAAoJEJ0WA1zPCt1hC2kH/3pGcAr61ANQ4/bhfDtYQaSy
-wssBhm9VAWS3vRvFPpf1+kta5dTPSqRKC4vbgAvo9l+dZ7lbukYZSQb7WX+zXlYB
-QwelkJ0rYJoLNMI2a7mekmzxLFfKyO7z775OZBirLHDAObBYeZ7Mtb/qsW0oJzoX
-pltxmbB/G+tY519TzpMOq18C6pY26OpYX/gqq9Q8bZo9V53Tilo4V5RI+sXryEr8
-r+KA2S6Wdti6IclPtYeEGz5yblHoGi/nI3+ODwNrKJ3yaqnMbpuhyt/jOmV1JsQH
-K3W0LGHHjDZcVE0/iy/F75Rat6elsZLuesR3VUbgicbu/DQOpOzVxZN5R1Hjbw8=
-=+CVK
+iQEcBAEBCAAGBQJQwpaZAAoJEJ0WA1zPCt1hwVwIAI4Ax+s0mXbrDLS3Xwi/7Xz5
+PiY3lj+eezDl4WLfH2+qWB+KZP8y1abd0pP1MHEbOkgl1vBqtBmXJ64O7B9j9K/J
+re7QVWMk3j6xglxUbtLaI2fkIi1EllnliTD7vnXJrb43+b0k7fvWrNVu1CwHhVqH
+dX78dHGydXUaxJj4lAjeKgiQ+y5JbFwfGmj3V8EOcIW3ozM+AWCP1ujEJ4+LSXOQ
+mMFKTSzbA+oMWIkq/DLveF7e+E5BiEtpvYg+gMgFV0USlduCKsEg+PDlCjSR1f9P
+uOuC2oq8Ylvw/Cag5ibJYNz5Ax/VsCQOYnRCCWrRXA8htL8fcqyVVXll3BMtcsk=
+=zAM2
 -----END PGP SIGNATURE-----
diff --git a/net-libs/farstream/farstream-0.1.2-r1.ebuild b/net-libs/farstream/farstream-0.1.2-r1.ebuild
index 2ae1c7046e60..faf3597a05bb 100644
--- a/net-libs/farstream/farstream-0.1.2-r1.ebuild
+++ b/net-libs/farstream/farstream-0.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/farstream-0.1.2-r1.ebuild,v 1.12 2012/12/08 00:58:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/farstream-0.1.2-r1.ebuild,v 1.13 2012/12/08 01:23:36 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,14 +15,14 @@ LICENSE="LGPL-2.1+"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection python msn test upnp"
 
-SLOT="0"
+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.26:2
+	>=dev-libs/glib-2.30:2
 	>=net-libs/libnice-0.1.0
 	introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
 	python? (
@@ -41,6 +41,7 @@ RDEPEND="${COMMONDEPEND}
 # This package is just a rename from farsight2
 
 DEPEND="${COMMONDEPEND}
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
 	test? (
 		media-libs/gst-plugins-good:0.10
diff --git a/net-libs/farstream/farstream-0.2.2.ebuild b/net-libs/farstream/farstream-0.2.2.ebuild
new file mode 100644
index 000000000000..b6671d9e9f64
--- /dev/null
+++ b/net-libs/farstream/farstream-0.2.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/farstream-0.2.2.ebuild,v 1.1 2012/12/08 01:23:36 tetromino Exp $
+
+EAPI="5"
+
+# no PYTHON_DEPEND, python is purely a build-time dependency
+inherit eutils python
+
+DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream"
+SRC_URI="http://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 msn test upnp"
+
+SLOT="0.2"
+
+# Tests need shmsink from gst-plugins-bad, which isn't packaged
+RESTRICT="test"
+
+COMMONDEPEND="media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=dev-libs/glib-2.32:2
+	>=net-libs/libnice-0.1.3-r1
+	introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
+	upnp? ( >=net-libs/gupnp-igd-0.2:= )"
+
+RDEPEND="${COMMONDEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-bad:1.0
+	media-plugins/gst-plugins-libnice:1.0
+	msn? ( media-plugins/gst-plugins-mimic:1.0 )"
+
+DEPEND="${COMMONDEPEND}
+	=dev-lang/python-2*
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? (
+		media-libs/gst-plugins-base:1.0[vorbis]
+		media-libs/gst-plugins-good:1.0 )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	plugins="fsrawconference,fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
+	use msn && plugins="${plugins},fsmsnconference"
+	econf --disable-static \
+		$(use_enable introspection) \
+		$(use_enable upnp gupnp) \
+		--with-plugins=${plugins}
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+src_test() {
+	# FIXME: do an out-of-tree build for tests if USE=-msn
+	if ! use msn; then
+		elog "Tests disabled without msn use flag"
+		return
+	fi
+
+	emake -j1 check
+}