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

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

6 files changed, 24 insertions, 90 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/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"