Version bump, remove old.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 19 insertions, 116 deletions

diff --git a/net-libs/farsight2/ChangeLog b/net-libs/farsight2/ChangeLog
index 65df7a0aab1a..c3c59999229d 100644
--- a/net-libs/farsight2/ChangeLog
+++ b/net-libs/farsight2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/farsight2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/ChangeLog,v 1.53 2011/08/20 17:46:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/ChangeLog,v 1.54 2011/08/29 15:35:21 pacho Exp $
+
+*farsight2-0.0.29 (29 Aug 2011)
+
+  29 Aug 2011; Pacho Ramos <pacho@gentoo.org> -farsight2-0.0.14.ebuild,
+  -farsight2-0.0.17.ebuild, -farsight2-0.0.25.ebuild, +farsight2-0.0.29.ebuild:
+  Version bump, remove old.
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> farsight2-0.0.26.ebuild:
   Stable for HPPA (bug #373393).
diff --git a/net-libs/farsight2/farsight2-0.0.14.ebuild b/net-libs/farsight2/farsight2-0.0.14.ebuild
deleted file mode 100644
index 24dceb193949..000000000000
--- a/net-libs/farsight2/farsight2-0.0.14.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.14.ebuild,v 1.11 2011/02/25 22:13:14 nirbheek Exp $
-
-EAPI="2"
-
-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 hppa ppc ~ppc64 x86"
-IUSE="python test"
-SLOT="0"
-
-COMMONDEPEND=">=media-libs/gstreamer-0.10.23
-	>=media-libs/gst-plugins-base-0.10.23
-	>=dev-libs/glib-2.16
-	>=net-libs/libnice-0.0.9[gstreamer]
-	<net-libs/libnice-0.1.0
-	python? (
-		|| ( >=dev-python/pygobject-2.16 >=dev-python/pygtk-2.12 )
-		>=dev-python/pygobject-2.12
-		>=dev-python/gst-python-0.10.10 )"
-
-RDEPEND="${COMMONDEPEND}
-	|| ( >=media-libs/gst-plugins-good-0.10.16
-		<media-libs/gst-plugins-bad-0.10.14 )
-	>=media-libs/gst-plugins-good-0.10.11
-	>=media-libs/gst-plugins-bad-0.10.13"
-
-DEPEND="${COMMONDEPEND}
-	test? ( media-plugins/gst-plugins-vorbis
-		media-plugins/gst-plugins-speex )
-	dev-util/pkgconfig"
-
-src_configure() {
-	econf $(use_enable python)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS README ChangeLog
-}
diff --git a/net-libs/farsight2/farsight2-0.0.17.ebuild b/net-libs/farsight2/farsight2-0.0.17.ebuild
deleted file mode 100644
index c4dc22503657..000000000000
--- a/net-libs/farsight2/farsight2-0.0.17.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.17.ebuild,v 1.11 2011/07/08 10:01:30 ssuominen Exp $
-
-EAPI="2"
-
-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 test msn upnp"
-SLOT="0"
-
-# tests are sometimes broken :-(
-RESTRICT=test
-
-COMMONDEPEND=">=media-libs/gstreamer-0.10.23
-	>=media-libs/gst-plugins-base-0.10.23
-	>=dev-libs/glib-2.16
-	>=net-libs/libnice-0.0.9[gstreamer]
-	<net-libs/libnice-0.1.0
-	python? (
-		|| ( >=dev-python/pygobject-2.16 >=dev-python/pygtk-2.12 )
-		>=dev-python/pygobject-2.12
-		>=dev-python/gst-python-0.10.10 )
-	upnp? ( net-libs/gupnp-igd )"
-
-RDEPEND="${COMMONDEPEND}
-	>=media-libs/gst-plugins-good-0.10.11
-	>=media-libs/gst-plugins-bad-0.10.13
-	|| ( >=media-libs/gst-plugins-good-0.10.16
-		<media-libs/gst-plugins-bad-0.10.14 )
-	msn? ( >=media-plugins/gst-plugins-mimic-0.10.14 )"
-
-DEPEND="${COMMONDEPEND}
-	test? ( media-plugins/gst-plugins-vorbis
-		media-plugins/gst-plugins-speex )
-	dev-util/pkgconfig"
-
-src_configure() {
-	plugins="fsrtpconference,funnel,rtcpfilter,videoanyrate"
-	use msn && plugins="${plugins},fsmsnconference"
-	econf $(use_enable python) \
-		$(use_enable upnp gupnp) \
-		--with-plugins=${plugins}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS README ChangeLog
-}
-
-src_test()
-{
-	use msn || { einfo "Tests disabled without msn use flag"; return ;}
-	if ! emake -j1 check; then
-		has test $FEATURES && die "Make check failed. See above for details."
-		has test $FEATURES || eerror "Make check failed. See above for details."
-	fi
-}
diff --git a/net-libs/farsight2/farsight2-0.0.25.ebuild b/net-libs/farsight2/farsight2-0.0.29.ebuild
index 54f87155b811..23f5bb181083 100644
--- a/net-libs/farsight2/farsight2-0.0.25.ebuild
+++ b/net-libs/farsight2/farsight2-0.0.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.25.ebuild,v 1.1 2011/02/21 07:29:38 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.29.ebuild,v 1.1 2011/08/29 15:35:21 pacho Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -13,15 +13,17 @@ 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 test msn upnp"
+IUSE="python msn upnp"
+# IUSE="python test msn upnp"
+
 SLOT="0"
 
-# Tests are broken, check again next release
+# Tests often fail due to races
 RESTRICT="test"
 
-COMMONDEPEND=">=media-libs/gstreamer-0.10.26
-	>=media-libs/gst-plugins-base-0.10.26
-	>=dev-libs/glib-2.16:2
+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
@@ -34,9 +36,9 @@ RDEPEND="${COMMONDEPEND}
 	msn? ( >=media-plugins/gst-plugins-mimic-0.10.17 )"
 
 DEPEND="${COMMONDEPEND}
-	test? ( media-plugins/gst-plugins-vorbis
-		media-plugins/gst-plugins-speex )
-	dev-util/pkgconfig"
+	        dev-util/pkgconfig"
+#	test? ( media-plugins/gst-plugins-vorbis
+#		media-plugins/gst-plugins-speex )
 
 pkg_setup() {
 	python_set_active_version 2
@@ -60,6 +62,7 @@ src_install() {
 }
 
 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