bump farstream

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

7 files changed, 142 insertions, 4 deletions

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index ff4b4f4a..2a0f0999 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1 +1 @@
-EBUILD empathy-9999-r1.ebuild 3388 RMD160 25df964321db8e1116ccdf887bcbf6c35a24f0d4 SHA1 309e8a81eae22095f9cde8794053c02678434256 SHA256 72dc74d36dd2f1234687a4e9e2518880387968e97c4c544b2ffea78079e932ac
+EBUILD empathy-9999-r1.ebuild 3350 RMD160 64781b4034b8fba16a1611d825b279ee7e304fab SHA1 dbb8f2a58d88be5e429d91c1728c5cb3c6d1b20b SHA256 3f21f75cf1a77b84d9c292bd558d22166820f4ae44a2ce930e8e3c593ac6fd99
diff --git a/net-im/empathy/empathy-9999-r1.ebuild b/net-im/empathy/empathy-9999-r1.ebuild
index 92542644..e3ca727d 100644
--- a/net-im/empathy/empathy-9999-r1.ebuild
+++ b/net-im/empathy/empathy-9999-r1.ebuild
@@ -44,8 +44,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	media-libs/gst-plugins-base:0.10
 	media-libs/gst-plugins-bad
 	>=net-im/telepathy-logger-0.2.10
-	net-libs/farsight2
-	>=net-libs/telepathy-farsight-0.0.18
+	net-libs/farstream
 	net-im/telepathy-connection-managers
 	x11-libs/libX11
 
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
new file mode 100644
index 00000000..80b6bef7
--- /dev/null
+++ b/net-libs/farstream/Manifest
@@ -0,0 +1,2 @@
+DIST farstream-0.1.1.tar.gz 1262988 RMD160 acb052add06f57ca92efbaf39a607f4c584746ba SHA1 1b10c6f735f05b5c6f77753036daa3940de8284b SHA256 7b88a0730fbdd03297295574a613409790bf751d578690d7072cbf2be3f9ad52
+EBUILD farstream-0.1.1.ebuild 1842 RMD160 bfab50be9ff6180061ca027472a0b6624eb696b1 SHA1 778b44da393cc958c62380b93654f428d9197697 SHA256 5be5cd1259bce8fe06dc2f173267249082f7bb911441db7e904e7fbebcd2f831
diff --git a/net-libs/farstream/farstream-0.1.1.ebuild b/net-libs/farstream/farstream-0.1.1.ebuild
new file mode 100644
index 00000000..62ecdc39
--- /dev/null
+++ b/net-libs/farstream/farstream-0.1.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="Farsight2 is an audio/video conferencing framework specifically designed for Instant Messengers."
+HOMEPAGE="http://farsight.freedesktop.org/"
+SRC_URI="http://farsight.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="python msn upnp"
+# IUSE="python test msn upnp"
+
+SLOT="0"
+
+# Tests often fail due to races
+RESTRICT="test"
+
+COMMONDEPEND=">=media-libs/gstreamer-0.10.33
+	>=media-libs/gst-plugins-base-0.10.33
+	>=dev-libs/glib-2.26:2
+	>=net-libs/libnice-0.1.0[gstreamer]
+	python? (
+		>=dev-python/pygobject-2.16:2
+		>=dev-python/gst-python-0.10.10 )
+	upnp? ( net-libs/gupnp-igd )"
+
+RDEPEND="${COMMONDEPEND}
+	>=media-libs/gst-plugins-good-0.10.17
+	>=media-libs/gst-plugins-bad-0.10.17
+	msn? ( >=media-plugins/gst-plugins-mimic-0.10.17 )"
+
+DEPEND="${COMMONDEPEND}
+	        dev-util/pkgconfig"
+#	test? ( media-plugins/gst-plugins-vorbis
+#		media-plugins/gst-plugins-speex )
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_configure() {
+	plugins="fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
+	use msn && plugins="${plugins},fsmsnconference"
+	econf --disable-static \
+		$(use_enable python) \
+		$(use_enable upnp gupnp) \
+		--with-plugins=${plugins}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc AUTHORS README ChangeLog
+
+	# Remove .la files since static libs are no longer being installed
+	find "${D}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+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
+}
diff --git a/net-libs/telepathy-farstream/Manifest b/net-libs/telepathy-farstream/Manifest
new file mode 100644
index 00000000..26ff92ab
--- /dev/null
+++ b/net-libs/telepathy-farstream/Manifest
@@ -0,0 +1,2 @@
+DIST telepathy-farstream-0.2.1.tar.gz 639293 RMD160 3167bb0d7e39d4bb4bd48974da9911e915b8332c SHA1 3e6221655cfd244cd0e5563f05bede10b3cff597 SHA256 01a0b66fc2d016a7e5b54f02797ad7134b0485e7a6398c3e3c11824a31e94d0c
+EBUILD telepathy-farstream-0.2.1.ebuild 1605 RMD160 a32e86a3aa9fdc5de718d582137dc6dcc74eec62 SHA1 e123487e4903e49604eb88efdc1f23a5175df936 SHA256 084dec568dd12cb7fcdd67d84511dd52d3ef5dd73e26310db9ac39f082ecc2cd
diff --git a/net-libs/telepathy-farstream/telepathy-farstream-0.2.1.ebuild b/net-libs/telepathy-farstream/telepathy-farstream-0.2.1.ebuild
new file mode 100644
index 00000000..f1d6fb75
--- /dev/null
+++ b/net-libs/telepathy-farstream/telepathy-farstream-0.2.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-farstream/telepathy-farstream-0.1.2.ebuild,v 1.3 2012/01/14 17:47:16 maekke Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.5"
+PYTHON_USE_WITH="xml"
+PYTHON_USE_WITH_OPT="python"
+
+inherit python
+
+DESCRIPTION="Telepathy client library that uses Farsight2 to handle Call channels"
+HOMEPAGE="http://telepathy.freedesktop.org"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples python"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.60
+	>=net-libs/telepathy-glib-0.13.4
+	>=net-libs/farstream-0.1.1
+	python? (
+		>=dev-python/pygobject-2.12.0:2
+		>=dev-python/gst-python-0.10.10 )"
+# python2 is needed at build time in all cases
+DEPEND="${RDEPEND}
+	!python? ( =dev-lang/python-2*[xml] )"
+
+pkg_setup() {
+	# Needed for xincludator.py at build time even if USE=-python
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	if use python; then
+		python_convert_shebangs -r 2 .
+	fi
+}
+
+src_configure() {
+	econf $(use_enable python) --disable-static
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog NEWS README
+
+	# Remove .la files since static libs are disabled
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+		if use python; then
+			insinto /usr/share/doc/${PF}/examples/python
+			doins python/examples/*.py
+		fi
+	fi
+}
diff --git a/profiles/categories b/profiles/categories
index 6c9fe175..fd2b6518 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -15,7 +15,6 @@ gnome-base
 gnome-extra
 media-libs
 media-sound
-media-video
 net-dns
 net-im
 net-libs