Version bump, adds documentation, fixes various bugs. Update license. Drop old.

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

7 files changed, 37 insertions, 101 deletions

diff --git a/media-plugins/grilo-plugins/ChangeLog b/media-plugins/grilo-plugins/ChangeLog
index b7f15ce32ab2..b11da1046eb2 100644
--- a/media-plugins/grilo-plugins/ChangeLog
+++ b/media-plugins/grilo-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/grilo-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.14 2012/11/25 14:45:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.15 2012/12/10 02:40:47 tetromino Exp $
+
+*grilo-plugins-0.2.4 (10 Dec 2012)
+
+  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -grilo-plugins-0.2.0.ebuild, -grilo-plugins-0.2.2.ebuild,
+  +grilo-plugins-0.2.4.ebuild:
+  Version bump, adds documentation, fixes various bugs. Update license. Drop
+  old.
 
 *grilo-plugins-0.2.3 (25 Nov 2012)
 
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 640b04915ed3..d2fccda5b34d 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -4,20 +4,22 @@ Hash: SHA256
 AUX grilo-plugins-0.1.18-tracker-0.14.patch 1366 SHA256 039dd863d4e36c9d778c82720c8b4465d01acadf6be244bf260b6ff035f5f2de SHA512 da7639f88b2cc8ed52c64dce2066f5c9f98142c471f5019b2d05e94e59802481fadf02f9d25bbf23fe0fbaaf7a8524a3765994b8859d62769361f073166f22ce WHIRLPOOL 464b3710d7badd400a3bafcc8198894d2d7fa615913d7af2e620087da315845b2eea26bbb2d5df49ea326741a454af83a1533f9a27495056df177afc474f607c
 DIST grilo-plugins-0.1.18.tar.xz 376696 SHA256 7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79 SHA512 6dfe50fcc0145c807b3ea6743e4fe25452cc178d07e49058ae7ed5e4dd87673fbeb5a5cb1fe5d682df5cace47dff585666f3ff20bc1d2a8eee9c18fcb5024aca WHIRLPOOL e5eb40729ad4575ac10fc919ca8b79e3cdb84b5089684243878700b94f822d5f5d57435999e5b51455c87bc7be8eb529bc97d9ab741b951b36cbdfad24061deb
 DIST grilo-plugins-0.1.20.tar.xz 384188 SHA256 4b0bf0f502f7a21827e1de4b60e70376d49524c3859a69ebff28d829ab8ae5b5 SHA512 6a7784a67725d694dd909766581b88549c39cea6a70127f04fc95ac9fb054ee4580d4e8712eb7dfe9ec4b4b6549efa88a8aa669ae69e92866141e0d83af5c06c WHIRLPOOL e5f6e8a97668ee83fb4126546a10034f6550b6a967706130a81331adb7315e49ed1d0dc4dbb7bd0543147817dbe87af811020dddd4a4f189c415aac980925f9b
-DIST grilo-plugins-0.2.0.tar.xz 384380 SHA256 86ecabe5b34a15e9c00285b599461e7eb590e2fff0a8b284157b789b192db4f7 SHA512 90048f0c996f3d75babbdbd2f06206c7fb7ba1b008276aaa6c7cb72c95956892a1f4a9c536b9c3c50514d0a6e7d2b5ea291b4a7b1daecc827a9cf6a1571cb6b8 WHIRLPOOL 5feafd966132a7ae8acfbec7f9ea94b4b97ccb777016f4ad0db15d45002e275a85156e4ed9b30af27a5908677e35f0f2f9f423158e63849462fd0b0251d93b1c
-DIST grilo-plugins-0.2.2.tar.xz 399280 SHA256 54e65b734917df74ba5e53d92a3b2e69edd669625820fd0353c22e9b0f61e90d SHA512 c8f6d50f8fce63455e5ca99e69529bd54a60578d9816c618a6cbcf4577e7c25f7d3beccaa60facd5f0b6f766ff164c8f58c6573a7853a63e0b35dee81026c18f WHIRLPOOL 96dbddf41367ed07a1d2115d4e488f6472e6fadaf68af86404fe8139f9fa7e6150d054ca582a5e0c14066e5598e74f3f9024cc624306326bf453ff97d6cb3e5c
 DIST grilo-plugins-0.2.3.tar.xz 401436 SHA256 2d70b7f148c29fde365cac1afcbfdd77b7f5fc0f65e60f3790c702121c65d7c8 SHA512 c637cf0909e7922a3a9eaae8bde902fab207ca709427d4f9164a67aa57eadc0553a3105c5e82209bcc193b04f2b4085483117adc919287f77814a2674f0d3735 WHIRLPOOL 13bec479a36b3d0b1dc40c2d7b2c24fb5776762b4afbc831ac2241fb40f29f82e141f9dddce3cfab72c2250dc00141ecd118c9a21fb38b84625d2f548e3dc512
-EBUILD grilo-plugins-0.1.18.ebuild 1827 SHA256 86fa910b8a4576816b45130794ca18e1ee115febc099a3a8b4a18342cb25166e SHA512 908127c462cd3f1caadd395b78d397f4cf8f78f7430fb4234b0cfa521849bd8c33ea71da18a20ebafc9355e7fef523d78babb7febead72237db9ec91c259c8d4 WHIRLPOOL 5558f1155daecbdb6dcebe8410ede79cd63149f5a623127d00d4a461af3d99d4ef91485caffa986579c94aaac0ff91df0e912a888552cd8be890143508deadba
-EBUILD grilo-plugins-0.1.20.ebuild 1820 SHA256 ab0c533901c9cf5ff3f2f359bfc4640b9936859cdbddae0026430ec22a2e57ac SHA512 0f526ed557e71983e0acfbdf487649a0fb72f741ece81c3a55ce1c2bf4853c01c5093fa1632f020fd6206d0ae7b4fcb0fda9f097cf3268b2d81ec7277dce4451 WHIRLPOOL fd05ec73d448e55aabecf1fc3593577f2d290422053fbee68bea5f1adc59cce6a991dbd055141bba1dfd1fc7405e8f6cabaacc36b9837928be731e99de7697c8
-EBUILD grilo-plugins-0.2.0.ebuild 1888 SHA256 bf66c330ff2db0e8f4082c33e02592f0c9834d48d01f899c9c213c8330d404bf SHA512 59c4a585ffad079ed862676415293676dac51dfaf91c9764f0b0c034c8577595140026c038ca02fb35f6cd23979a6612058dc2224118cc34ab714bf05bee6827 WHIRLPOOL d68715e2c189cbcdb7be0d20a6ea77acfb02a43fc568a9958a0813a644fa5532aacb9eee95254c1ef6bbeb87008a0b9a18fb3482f7ced615526ae9da5888cb09
-EBUILD grilo-plugins-0.2.2.ebuild 1776 SHA256 6368541a2f932523523917d64152faf75398bde32b2335f5fd79f1d5b648b899 SHA512 3a06e5948cd8b0eee77d98d7e8514e78975ca69ffaf84a1418834074a471d22432b23f68511eafaea7eb746054cbd680afb479c11a8cab63a0e64448dbacce5a WHIRLPOOL 62b9cf72dfc5a4dfb83e12297b7e767d1b6c3cea752d8be804157f357d01980d0b8b05acc7a9be1bc2f6a74161461b18ee920675284ba3a27d6550ff4ae46e63
-EBUILD grilo-plugins-0.2.3.ebuild 1793 SHA256 368c165fee5356b1e7ab22d3822c5f02909afac7a05faea4ed32f8b1faa8e61e SHA512 66747058e84e5f068d225f15d74aec31c85b9d7861df088674e6510e1520f1b744d3b1edca559cc6837cebb446ee8e1d6e1d89eff61ef48c9ea447cb300e8d8c WHIRLPOOL 7b3861e68f0b0e8338f14c1c25ec02761072cd817439daf439e55fcf234272553b9565a06d7fbc6906aa4e7e2de54e89e44ebc7793e06c8e22563fad0f037b26
-MISC ChangeLog 4333 SHA256 a3755a28f6dfe0ddc7c68e236ddaef54280eafdb1eaadf8b8e8b2aeecffb21f9 SHA512 87e20bba8abb2fdc15c3239bb43cc4869f9d0ef486cbd15874fa3826f5ff08ee0b873aee14a8965bd5f7fde358991b5ba9973de2349b0db9cd82df887da2db6c WHIRLPOOL 7df94573fa1c3c067fbd3f92aa5fde1ace0c9f2b285ea840591171de2a346b055509e8c76358f87fc5161fb157c6e22974077f9afd5c160fd2b9369864763569
+DIST grilo-plugins-0.2.4.tar.xz 427368 SHA256 7e96aee95abc22897db4c62738b65f31fab66a26a22a628f2dfe682384c09350 SHA512 61294231e6630a6df092d4cef2790d4e4c482b3153f406e89c327fa824325a4db635a7dcdbbb1cd35aab8e39e4875f7fc1fdbf938ede36240150f3ab31f9424c WHIRLPOOL 2c4359ad97ac2384c9ddebddbd120d560882cbf9bef2d309419c0e59963632ab780acc0ac1149e5cde7171b59a251904027381318fa693dd9b157ad9b6a5a241
+EBUILD grilo-plugins-0.1.18.ebuild 1834 SHA256 e8ee0cae3ed18a32ae7ff8a5cb8244cb65bc9b4c9b6e426bc47272301bad69db SHA512 d3c5a96d90b160db6cb38d7ad02960c0ad18f13d4054f5190a7f0cb1b3b3bb0caa0364bdb34a2219f3b081217ffb0ee50fafaf263158a41e1df2a61f27b3152b WHIRLPOOL d3467c698148ed662e95fe5ac5ee996b66297acdabcd6f368aa864e8cb6cb67c48e38363b8557d4bc4a88f08abe0c9711819dd286bbe8267bd08d9e2af6a239a
+EBUILD grilo-plugins-0.1.20.ebuild 1821 SHA256 e6adf320e29fd1564ba6dabbb77a17a1291fd10f2de760e21213e7332d426349 SHA512 56cff7dc9120331a12e4a81e2eb9778c3c75e538a0e968f972b4460e7d50cb60a6406226432083ee57f7a543fc03811f25c30e983fff0bd152dda99b8ef5ab30 WHIRLPOOL 5bffecbbc260f2c1eb1d2806aa9efd8398ed9c9c09572a5a6f89295f01171f2cc310111a21b99a524be5bc6d483c28bb83b33b0a675d12f3ed14822e5948776b
+EBUILD grilo-plugins-0.2.3.ebuild 1800 SHA256 e683ca7440dd029cb33e6c689ca30d57e0f6728d2f087dc9d79e6946ed60e348 SHA512 99464512bfa171804bc0bea9fd83b8f32014dde764508d5a940b46fdf85f6cc08bd836296abf0c8433e4743d28a3cff5de0c979722837fc43e5be689183d8306 WHIRLPOOL fcac6cebc6d3ac8d1023c6bbce262058fa37ba76c622e718d7c3f72d67960fbd19fb7cb3597d3eabe82e3930efc91390ce9bd95557c58b8ccc17eccc46a536b0
+EBUILD grilo-plugins-0.2.4.ebuild 1841 SHA256 ed62201655d1fd640eb9f5e48a6c78eb8b75362918a54d0ef457df88853d1ec9 SHA512 e928aadbe3fb61de2f1a4929f7b3695c6bfd11e4eea26742ea4a4e7656e665f5a1fd69e07deeb39fba3e3a616965d532d94f58b777f7dc5f07c2f7aaef654f09 WHIRLPOOL 2fdfce2c202e5a5dc51e8cfb1008a056c595c874cff5b10e42be0e6b3adcc1c4b3ac10dd1e793b9eb6b696020ec6ea95d199f595a69a37b6213092f4d58338b9
+MISC ChangeLog 4610 SHA256 46d1af5635628b8cca03181b24a46552aa6d57aa0b5d86f945058c951d49385f SHA512 5e0f20d4c4950b12f5a22b452273812a31c850e83724c5d9e6ca6b3d850c8b435b15050a6b50736142ecfd3d04c0fdcfd9a5204566f81d9d6fa09c2b358eca3e WHIRLPOOL 714cb707e6be681f0fe0f784d3326124b6f02dc7eb640141ff88770e48b93379f1a3a2e08abf22082f16e0740d7201437b8df71a597d723cf47214aa8d93d14e
 MISC metadata.xml 674 SHA256 91a2609d2adc03fab1eb2b61803a4cf2fb4d0dc39704f3d15854a875d5613eb7 SHA512 6496a36b4c5b502a524ccfba9899aecd39114f1f145d9411b6c18bac833a07cef8807935992ca9170fd9b848850f353ee430b6c993b54f7887257ab11f09f6f7 WHIRLPOOL 8233c95d8b215af47afe48bb2f13403890cc9684c8d61777746f0a31027cfe3db2a80623891b6c48fea8fae09732d4895e622d52a961c1666cfb33289f73b742
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCyLvoACgkQ1fmVwcYIWAYTkQCdHdYbv2/LURDyb5eEVOIFDfT/
-UUoAoJupMbkqEgqXkUxHF2a3tSSx2535
-=Rlfe
+iQEcBAEBCAAGBQJQxUuxAAoJEJ0WA1zPCt1hSiwIAIXo2+ZZhp4n6jA+kRyEOHi5
+CYtjp1lzClk6lCVnEx3M37RjfvffcLRJEhbdFNjC5eNRe0TlnwkKxeP0BSvxP0kk
+N5l+NZg9dHKTaOJr3Q6boldLEkmYBzO0mHVX2CDYEFjTNfgtEY7CeKBqFAPPG85m
+2q5N1KPY0E+K6Juo5dU+s/kOgGDGfTZwvkAih7gMYj+xMal3cHRD9w0qZVp6ZjuZ
+3SvkE1eJTIYnGCeUFHbH/adkX9Qya9t1tddtBS7ZYR1bBltuqiu466Q/Vm+4a5zA
+GRrCnVg4wuM4rewDrImQWNwdhBVrExZqZVmMJYMgAGgsrHWfok3HoaDS0Kr1/FQ=
+=9Yjg
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild
index a124b7911b66..7ec2d1c5c070 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.1.18.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/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild,v 1.6 2012/10/04 14:57:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild,v 1.7 2012/12/10 02:40:47 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -11,7 +11,7 @@ inherit autotools eutils gnome2
 DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0.1"
 KEYWORDS="amd64 x86"
 IUSE="upnp +vimeo +youtube"
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild
index f89489cf8585..a9cf5f74544c 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.1.20.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/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild,v 1.1 2012/09/16 02:50:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild,v 1.2 2012/12/10 02:40:47 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="+dvd tracker upnp +vimeo +youtube"
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.0.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.0.ebuild
deleted file mode 100644
index de371786cf88..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.2.0.ebuild,v 1.1 2012/09/16 02:50:33 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://live.gnome.org/Grilo"
-
-LICENSE="LGPL-2.1"
-SLOT="0.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dvd tracker upnp +vimeo +youtube"
-
-# TODO: Blip.TV (requires librest)
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	~media-libs/grilo-${PV}:${SLOT}[network]
-
-	dev-libs/gmime:2.6
-	dev-libs/libxml2:2
-	dev-db/sqlite:3
-
-	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
-	tracker? ( >=app-misc/tracker-0.10.5 )
-	youtube? ( >=dev-libs/libgdata-0.7
-		>=media-libs/libquvi-0.4.0 )
-	upnp? ( >=net-libs/gupnp-0.13
-		>=net-libs/gupnp-av-0.5 )
-	vimeo? ( net-libs/libsoup:2.4
-		dev-libs/libgcrypt )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# `make check` doesn't do anything, and ${S}/test/test fails without all plugins
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# --enable-debug only changes CFLAGS, useless for us
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-debug
-		--disable-uninstalled"
-
-	# Plugins
-	# TODO: Enable Blip.TV support (requires librest)
-	# shoutcast seems to be broken
-	G2CONF="${G2CONF}
-		--disable-bliptv
-		--enable-apple-trailers
-		--enable-bookmarks
-		--enable-filesystem
-		--enable-flickr
-		--enable-gravatar
-		--enable-jamendo
-		--enable-lastfm-albumart
-		--enable-localmetadata
-		--enable-metadata-store
-		--enable-podcasts
-		--disable-shoutcast
-		$(use_enable dvd optical-media)
-		$(use_enable tracker)
-		$(use_enable upnp)
-		$(use_enable vimeo)
-		$(use_enable youtube)"
-}
-
-src_prepare() {
-	sed -i -e 's/^\(SUBDIRS .*\)test/\1/g' Makefile.*
-
-	gnome2_src_prepare
-}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.3.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.3.ebuild
index f9df69fa1f68..fe84d1598ed7 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.3.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.3.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/media-plugins/grilo-plugins/grilo-plugins-0.2.3.ebuild,v 1.1 2012/11/25 14:45:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.2.3.ebuild,v 1.2 2012/12/10 02:40:47 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0.2"
 KEYWORDS="~amd64 ~x86"
 IUSE="daap +dvd tracker upnp +vimeo +youtube"
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.2.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.4.ebuild
index 26a17ea46354..17046634c2f7 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.2.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.4.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/media-plugins/grilo-plugins/grilo-plugins-0.2.2.ebuild,v 1.1 2012/10/28 14:40:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.2.4.ebuild,v 1.1 2012/12/10 02:40:47 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -11,20 +11,19 @@ inherit gnome2
 DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0.2"
 KEYWORDS="~amd64 ~x86"
 IUSE="daap +dvd tracker upnp +vimeo +youtube"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
-	>=media-libs/grilo-0.2.2:${SLOT}[network]
+	>=media-libs/grilo-0.2.3:${SLOT}[network]
 
 	dev-libs/gmime:2.6
 	dev-libs/json-glib
 	dev-libs/libxml2:2
 	dev-db/sqlite:3
-	net-libs/rest:0.7
 
 	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
 	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
@@ -33,13 +32,16 @@ RDEPEND="
 		>=dev-libs/libgdata-0.9.1
 		>=media-libs/libquvi-0.4.0 )
 	upnp? (
+		net-libs/gssdp
 		>=net-libs/gupnp-0.13
 		>=net-libs/gupnp-av-0.5 )
 	vimeo? (
-		net-libs/libsoup:2.4
-		dev-libs/libgcrypt )
+		dev-libs/libgcrypt
+		media-libs/libquvi )
 "
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/gnome-doc-utils
 	virtual/pkgconfig
 "
 
@@ -47,6 +49,7 @@ src_prepare() {
 	DOCS="AUTHORS NEWS README"
 	# --enable-debug only changes CFLAGS, useless for us
 	G2CONF="${G2CONF}
+		--e
 		--disable-static
 		--disable-debug
 		--disable-uninstalled"