Update dependencies for gst-plugins-libnice split. Update license, description, homepage.

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

4 files changed, 38 insertions, 20 deletions

diff --git a/net-libs/farsight2/ChangeLog b/net-libs/farsight2/ChangeLog
index 0f69114bde1f..014874fa427c 100644
--- a/net-libs/farsight2/ChangeLog
+++ b/net-libs/farsight2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/farsight2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/ChangeLog,v 1.71 2012/10/28 16:18:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/ChangeLog,v 1.72 2012/12/08 00:58:20 tetromino Exp $
+
+  08 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  farsight2-0.0.29.ebuild, farsight2-0.0.31.ebuild:
+  Update dependencies for gst-plugins-libnice split. Update license,
+  description, homepage.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> farsight2-0.0.31.ebuild:
   ia64/sparc stable wrt #427544
diff --git a/net-libs/farsight2/Manifest b/net-libs/farsight2/Manifest
index 43c51cfdfc80..a337e1fc25d5 100644
--- a/net-libs/farsight2/Manifest
+++ b/net-libs/farsight2/Manifest
@@ -4,14 +4,18 @@ Hash: SHA256
 AUX farsight2-0.0.20-make-382.patch 1179 SHA256 a22e539ec7d534b0f4cae1d495aa87fba4fa2c2b1cbdf3e2934f49f936c5227d SHA512 723d14fdb8f894ba6a6b8400e98108f37406c2880b3f4e3fa13fb4b2459cbba951fe381693c0d5d6993a595beca784cfb5c6d39d89788569d036ea1962d7f82b WHIRLPOOL 4645d35f4d1f24662009d7b03b9117b5914c74daa72ed577e59180210ae2d4e1201ac83bb4c43d0735fe102c7a031ab0ffe01602300fae56587301f50c2f3b5c
 DIST farsight2-0.0.29.tar.gz 1187510 SHA256 4001ad9e7c61ab3cbca37d6cf3f66260778cf9da0c2fede94f032b522a27e6e5 SHA512 4a90fd9dbd4155cd29f9548db0767f7d968e4789ac794687ae9c41e070ec95185afa8d748c6d7e51310912f03626c205048257bfe39609da5c36b55b8da595d5 WHIRLPOOL 86d57b3327c0380fdbacedd76c960e09e0dac134ff4fed6e847fd256384575f8e435e8edba0b1c36206242ed38b302a6c3c78657e801d2bb797c7dae24e5ef3f
 DIST farsight2-0.0.31.tar.gz 1231416 SHA256 55ce219c67a93bc55bcf30d6a5bfcadf09e1c5349d179b2da9ccb74c42271f9b SHA512 4dcde047df9fd913ff30de49b623c70d970fe43e1b93670934b3d14176448732cf9c8f220836c61279a8236993072cdf223c1250ec835edd8564c9b45d6f9306 WHIRLPOOL b07f60ca40ad1d616f4fc0ce28a710c55d796f5b7d36ca9f984707a8a4dbe58ed4f87ce2492f28daf3b827811638f752dc0f4890c6b2920d74d915b9114a1539
-EBUILD farsight2-0.0.29.ebuild 1961 SHA256 b8c4433007729ce1a3b0e28c076e04cdde34b6ae9edfba33c94c79f51542bcde SHA512 0d118a2ca465598df03f0564fd23389f187bab19f25d7645f44d10ea27016876acbb63fc3ff29be04cc669035b9798ce30511611f18e8f9d041dff4f16c1cd28 WHIRLPOOL 2cc8e885bac8a69eedc5c36d851df3fa005ff8e0134ee0b0fbd15228c51a6176ce1a4e581084c8aeffc331c49a5e4d0a85a0ab561641d261f29243d940f3a252
-EBUILD farsight2-0.0.31.ebuild 1878 SHA256 763532854c44d8b1872bddf9fd55d7cd5ba406c16136e96477645cb59c0062d5 SHA512 7b3cf67bca947b3944d8a1d1f79f2ce6edf14957fdf40bad197e5937338f2eb890271c32b217ebb348932bf139256c96c74fe7273340890c1105aa816d9d0402 WHIRLPOOL 5999fb724d269b786b52954b30178ff328b1fead822f153eab1c8be7d3084033784057499b93973aeb847507b28a4eed3850a9f9926475f13fc3ca392872d416
-MISC ChangeLog 9268 SHA256 17a29734c68e61bdd8b5043a9b9210a36839c6546a3b881d65040a6f424d9e05 SHA512 06388a9349b792915b52e05cce03e9b0fe980eb3edc8bfa0f28ab60050afd85e896ae3f61d719ed740b154942a2909604641c7e2654b616f88274b97441660d2 WHIRLPOOL ed5cbc60235bf308004cfa14d88017b792f53f4b767747fdb9e3b5e57a6a10a2b275421b47eb8e0188d38a3df5794eee56e7dcddf3883535815e1da81537bbd7
+EBUILD farsight2-0.0.29.ebuild 2064 SHA256 90d5faddfddcd780909b50ac76a5e13c6e37c5698359b61b25f8a0c322018d8e SHA512 26883a87a3009602c088943caf1beb7643abda5063214f724a364d6533c929dcdf320c50e2a72384d18709b8e36becb68328e705a67bf0d8c06525bace6d7760 WHIRLPOOL c9ec306e8069d7752ca0201c0b6599ce1c28f36f5fdf3b7b4e78ac8fa126eeb68543caa94f29df92ce3566ad041cc2061bbd00001e4b2812dc75b03e0e15195a
+EBUILD farsight2-0.0.31.ebuild 2021 SHA256 f272cf2e9917b77e3b5591d57d9aaaa94ab2056ab8c48f918cdb18d7a94c542b SHA512 71af4577e16c6c2106a4ae735e42580c94bd6a945b6cdb01ea0d276540eb32c796273da0d26b55c41eadb507e5b70eb2b0f81f2898bc3981162de074ba4ceb79 WHIRLPOOL 246a728110eea8ae4dbfce808ee683340670f51185d7087ed97f8be27f2bdbee6c0b1e67546aad02059fa7b8fe28cac7fe7ebb7f533e46b36e724f2d046c6a84
+MISC ChangeLog 9476 SHA256 2d6b0e5f683a1f1cf10ba748ad957afafa1a902a4608066ca31c8f7f94d21b4f SHA512 7ddd4bc9c378978ceeb1a784e67f9be7c510593671d42f0188b24fbdff279418a53fc04a1064bb3042b8d7f1ce2e763d2e35038870d9aa891bb327c12ecf059e WHIRLPOOL 81f4db095dc4044d7801ede0f170cdadfd7a925f9405391794f9ec48fefee360781a166b38001928f33e837360a929527c11162932a27619be02fb96b2f7d197
 MISC metadata.xml 245 SHA256 47b2d4a38474d4075b13b74cf7cde9bfa4937fa5c8cadbf03ce3b04921c81ddd SHA512 825740dfcfeb82963bb388be7e7c6ab4ec04a1ca91a3957f453020a8ecdfc82fddd2074b0f40e31c4e4593c93e8c83c052b78354edba6b18fb4cfe9d94d8ee5f WHIRLPOOL d860ff0f64ed573268e81ee8f77f92ec8f799edb52d966efa713f66689bd0b9c24e73246c8f961dc49324fdc6528c19cfe3a419616219fb333e72f5e1e12ddec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNWsAACgkQuQc30/atMkCtOQCcDBwoRrlTreFb2JTM03Qg9AA7
-BoEAoL0SLVp2Pl7eGic8/4SoHFWYEyZx
-=/Cj+
+iQEcBAEBCAAGBQJQwpCuAAoJEJ0WA1zPCt1hYmwIAKwPtDFm6/jdfgdvcVWG5OJ9
+jJlRHU8faV0kJRTRGiFGJHfTxlJxyvZqp2rQ8dcLJ1qixboirKsk3oJr250pcTLm
+iPBopnoi8tFpLdQXTrktMWlHhr2TuAWSrkVIgQdoxjzv31v6Sp2fhW75iwRe7dhn
+p1XFPukTdILGx4TwI4SxBLnGgMK6rrSMf96gFK89z6Dig8dYG1/Ae+iPkBFxB7zM
+be1fQorIr0EZXEaAt2GgVGw4ge5ikR4Vz46dpuw0X8exkO4KJowaeuN1QbvKyHat
+nkd9HWhzp6O3SWgtnJ/QF7lSkxfIpgNeQ1Qw51i544+ZPQmFweDUOe3GW+3IBNo=
+=Zc6r
 -----END PGP SIGNATURE-----
diff --git a/net-libs/farsight2/farsight2-0.0.29.ebuild b/net-libs/farsight2/farsight2-0.0.29.ebuild
index 077fa5d883f8..75049a69230d 100644
--- a/net-libs/farsight2/farsight2-0.0.29.ebuild
+++ b/net-libs/farsight2/farsight2-0.0.29.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/farsight2/farsight2-0.0.29.ebuild,v 1.9 2012/10/25 20:59:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.29.ebuild,v 1.10 2012/12/08 00:58:20 tetromino Exp $
 
 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"
+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="python msn upnp"
 # IUSE="python test msn upnp"
@@ -24,7 +24,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
 	python? (
 		>=dev-python/pygobject-2.16:2
 		>=dev-python/gst-python-0.10.10:0.10 )
@@ -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 )"
 
 DEPEND="${COMMONDEPEND}
diff --git a/net-libs/farsight2/farsight2-0.0.31.ebuild b/net-libs/farsight2/farsight2-0.0.31.ebuild
index 00754c671e69..c2879760c4d0 100644
--- a/net-libs/farsight2/farsight2-0.0.31.ebuild
+++ b/net-libs/farsight2/farsight2-0.0.31.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/farsight2/farsight2-0.0.31.ebuild,v 1.8 2012/10/28 16:18:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.31.ebuild,v 1.9 2012/12/08 00:58:20 tetromino Exp $
 
 EAPI="4"
 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"
+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="python msn upnp"
 # IUSE="python test msn upnp"
@@ -24,7 +24,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
 	python? (
 		>=dev-python/pygobject-2.16:2
 		>=dev-python/gst-python-0.10.10 )
@@ -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 )"
 
 DEPEND="${COMMONDEPEND}
@@ -41,7 +44,10 @@ DEPEND="${COMMONDEPEND}
 #		media-plugins/gst-plugins-speex )
 
 pkg_setup() {
-	python_set_active_version 2
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 src_configure() {