Version bump. Rename upnp USE flag to upnp-av (bug #435772, thanks to Michał Górny). Drop old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

6 files changed, 30 insertions, 22 deletions

diff --git a/media-plugins/grilo-plugins/ChangeLog b/media-plugins/grilo-plugins/ChangeLog
index 706ef7d2456a..0980c6d1892e 100644
--- a/media-plugins/grilo-plugins/ChangeLog
+++ b/media-plugins/grilo-plugins/ChangeLog
@@ -1,6 +1,15 @@
 # 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.16 2012/12/10 13:00:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.17 2012/12/15 18:41:09 tetromino Exp $
+
+*grilo-plugins-0.2.5 (15 Dec 2012)
+
+  15 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  grilo-plugins-0.1.18.ebuild, grilo-plugins-0.1.20.ebuild,
+  -grilo-plugins-0.2.3.ebuild, grilo-plugins-0.2.4.ebuild,
+  +grilo-plugins-0.2.5.ebuild, metadata.xml:
+  Version bump. Rename upnp USE flag to upnp-av (bug #435772, thanks to Michał
+  Górny). Drop old.
 
   10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   grilo-plugins-0.2.4.ebuild:
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 7ec2d1c5c070..8f3385b9104c 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.7 2012/12/10 02:40:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.1.18.ebuild,v 1.8 2012/12/15 18:41:09 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Grilo"
 LICENSE="LGPL-2.1+"
 SLOT="0.1"
 KEYWORDS="amd64 x86"
-IUSE="upnp +vimeo +youtube"
+IUSE="upnp-av +vimeo +youtube"
 
 RDEPEND="
 	>=dev-libs/glib-2.26:2
@@ -26,7 +26,7 @@ RDEPEND="
 
 	youtube? ( >=dev-libs/libgdata-0.7
 		>=media-libs/libquvi-0.2.15 )
-	upnp? ( >=net-libs/gupnp-0.13
+	upnp-av? ( >=net-libs/gupnp-0.13
 		>=net-libs/gupnp-av-0.5 )
 	vimeo? ( net-libs/libsoup:2.4
 		dev-libs/libgcrypt )"
@@ -60,7 +60,7 @@ pkg_setup() {
 		--disable-bliptv
 		--disable-shoutcast
 		--disable-tracker
-		$(use_enable upnp)
+		$(use_enable upnp-av upnp)
 		$(use_enable vimeo)
 		$(use_enable 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 a9cf5f74544c..314fba2c9974 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.2 2012/12/10 02:40:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.1.20.ebuild,v 1.3 2012/12/15 18:41:09 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Grilo"
 LICENSE="LGPL-2.1+"
 SLOT="0.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="+dvd tracker upnp +vimeo +youtube"
+IUSE="+dvd tracker upnp-av +vimeo +youtube"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
@@ -28,7 +28,7 @@ RDEPEND="
 	tracker? ( >=app-misc/tracker-0.10.5 )
 	youtube? ( >=dev-libs/libgdata-0.7
 		>=media-libs/libquvi-0.4 )
-	upnp? ( >=net-libs/gupnp-0.13
+	upnp-av? ( >=net-libs/gupnp-0.13
 		>=net-libs/gupnp-av-0.5 )
 	vimeo? ( net-libs/libsoup:2.4
 		dev-libs/libgcrypt )"
@@ -63,7 +63,7 @@ pkg_setup() {
 		--disable-shoutcast
 		$(use_enable dvd optical-media)
 		$(use_enable tracker)
-		$(use_enable upnp)
+		$(use_enable upnp-av upnp)
 		$(use_enable vimeo)
 		$(use_enable youtube)"
 }
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.4.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.4.ebuild
index 855d905c388d..c69cbd37dfe8 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.4.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.4.ebuild,v 1.2 2012/12/10 13:00:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.2.4.ebuild,v 1.3 2012/12/15 18:41:09 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Grilo"
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
 KEYWORDS="~amd64 ~x86"
-IUSE="daap +dvd tracker upnp +vimeo +youtube"
+IUSE="daap +dvd tracker upnp-av +vimeo +youtube"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
@@ -31,7 +31,7 @@ RDEPEND="
 	youtube? (
 		>=dev-libs/libgdata-0.9.1
 		>=media-libs/libquvi-0.4.0 )
-	upnp? (
+	upnp-av? (
 		net-libs/gssdp
 		>=net-libs/gupnp-0.13
 		>=net-libs/gupnp-av-0.5 )
@@ -72,7 +72,7 @@ src_prepare() {
 		$(use_enable daap dmap)
 		$(use_enable dvd optical-media)
 		$(use_enable tracker)
-		$(use_enable upnp)
+		$(use_enable upnp-av upnp)
 		$(use_enable vimeo)
 		$(use_enable youtube)"
 
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.3.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.5.ebuild
index fe84d1598ed7..488942658f6d 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.3.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.5.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.2 2012/12/10 02:40:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.2.5.ebuild,v 1.1 2012/12/15 18:41:09 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Grilo"
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
 KEYWORDS="~amd64 ~x86"
-IUSE="daap +dvd tracker upnp +vimeo +youtube"
+IUSE="daap +dvd tracker upnp-av +vimeo +youtube"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
@@ -24,7 +24,6 @@ RDEPEND="
 	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 )
@@ -32,15 +31,17 @@ RDEPEND="
 	youtube? (
 		>=dev-libs/libgdata-0.9.1
 		>=media-libs/libquvi-0.4.0 )
-	upnp? (
+	upnp-av? (
 		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-0.4.0 )
 "
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/gnome-doc-utils
 	virtual/pkgconfig
 "
 
@@ -71,7 +72,7 @@ src_prepare() {
 		$(use_enable daap dmap)
 		$(use_enable dvd optical-media)
 		$(use_enable tracker)
-		$(use_enable upnp)
+		$(use_enable upnp-av upnp)
 		$(use_enable vimeo)
 		$(use_enable youtube)"
 
diff --git a/media-plugins/grilo-plugins/metadata.xml b/media-plugins/grilo-plugins/metadata.xml
index e67b51dcad47..bbbd91452b0f 100644
--- a/media-plugins/grilo-plugins/metadata.xml
+++ b/media-plugins/grilo-plugins/metadata.xml
@@ -6,8 +6,6 @@
 			<pkg>net-libs/libdmapsharing</pkg></flag>
 		<flag name="tracker">Build support for content discovery using the
 			<pkg>app-misc/tracker</pkg> indexer</flag>
-		<flag name="upnp">Build support for UPnP Audio/Video streaming using
-			<pkg>net-libs/gupnp-av</pkg></flag>
 		<flag name="vimeo">Build support for Vimeo content discovery using
 			<pkg>net-libs/libsoup</pkg> and <pkg>dev-libs/libgcrypt</pkg></flag>
 		<flag name="youtube">Build support for YouTube content discovery using