summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-08 00:58:43 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-08 00:58:43 +0000
commit6985a8f1f71dfe5119453c0d7aaeb4918d99197b (patch)
tree3364bcf0f3a33387876ad5b6756bdb77f717d5c2 /net-libs/farstream
parentUpdate dependencies for gst-plugins-libnice split. Update license, descriptio... (diff)
downloadgentoo-2-6985a8f1f71dfe5119453c0d7aaeb4918d99197b.tar.gz
gentoo-2-6985a8f1f71dfe5119453c0d7aaeb4918d99197b.tar.bz2
gentoo-2-6985a8f1f71dfe5119453c0d7aaeb4918d99197b.zip
Update dependencies for gst-plugins-libnice split. Update license, description, homepage.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'net-libs/farstream')
-rw-r--r--net-libs/farstream/ChangeLog7
-rw-r--r--net-libs/farstream/farstream-0.1.2-r1.ebuild20
2 files changed, 19 insertions, 8 deletions
diff --git a/net-libs/farstream/ChangeLog b/net-libs/farstream/ChangeLog
index 4b5e87e92368..07620014b73f 100644
--- a/net-libs/farstream/ChangeLog
+++ b/net-libs/farstream/ChangeLog
@@ -1,6 +1,11 @@
# 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.13 2012/12/02 17:04:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/ChangeLog,v 1.14 2012/12/08 00:58:43 tetromino Exp $
+
+ 08 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ farstream-0.1.2-r1.ebuild:
+ Update dependencies for gst-plugins-libnice split. Update license,
+ description, homepage.
02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
farstream-0.1.2-r1.ebuild:
diff --git a/net-libs/farstream/farstream-0.1.2-r1.ebuild b/net-libs/farstream/farstream-0.1.2-r1.ebuild
index 1cb6488c34be..2ae1c7046e60 100644
--- a/net-libs/farstream/farstream-0.1.2-r1.ebuild
+++ b/net-libs/farstream/farstream-0.1.2-r1.ebuild
@@ -1,17 +1,17 @@
# 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.11 2012/12/02 17:04:23 eva Exp $
+# $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 $
EAPI="4"
PYTHON_DEPEND="2"
inherit eutils 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"
+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"
+LICENSE="LGPL-2.1+"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+introspection python msn test upnp"
@@ -23,7 +23,7 @@ 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
- >=net-libs/libnice-0.1.0[gstreamer]
+ >=net-libs/libnice-0.1.0
introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
python? (
>=dev-python/pygobject-2.16:2
@@ -33,6 +33,9 @@ COMMONDEPEND=">=media-libs/gstreamer-0.10.33:0.10
RDEPEND="${COMMONDEPEND}
>=media-libs/gst-plugins-good-0.10.17:0.10
>=media-libs/gst-plugins-bad-0.10.17:0.10
+ || (
+ >=media-plugins/gst-plugins-libnice-0.1.0:0.10
+ <=net-libs/libnice-0.1.3[gstreamer] )
msn? ( >=media-plugins/gst-plugins-mimic-0.10.17:0.10 )
!net-libs/farsight2"
# This package is just a rename from farsight2
@@ -44,7 +47,10 @@ DEPEND="${COMMONDEPEND}
media-plugins/gst-plugins-vorbis:0.10 )"
pkg_setup() {
- python_set_active_version 2
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
}
src_prepare() {