Bump to 0.1.17, remove old, from gnome overlay

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 72 insertions, 28 deletions

diff --git a/media-plugins/grilo-plugins/ChangeLog b/media-plugins/grilo-plugins/ChangeLog
index 9a7439f3a1ed..c5e1ad9fee99 100644
--- a/media-plugins/grilo-plugins/ChangeLog
+++ b/media-plugins/grilo-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/grilo-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.3 2011/08/14 10:52:41 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/ChangeLog,v 1.4 2011/10/01 16:33:37 nirbheek Exp $
+
+*grilo-plugins-0.1.17 (01 Oct 2011)
+
+  01 Oct 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -grilo-plugins-0.1.15.ebuild, +grilo-plugins-0.1.17.ebuild,
+  +files/grilo-plugins-0.1.17-apple-trailers-fix.patch:
+  Bump to 0.1.17, remove old, from gnome overlay
 
 *grilo-plugins-0.1.16 (14 Aug 2011)
 
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 9929d72b46c3..c6d06e4e0cec 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -6,26 +6,27 @@ AUX grilo-plugins-0.1.16-youtube-c90.patch 5445 RMD160 6dde0d526f703f7492bec2903
 AUX grilo-plugins-0.1.16-youtube-libgdata-0.9.patch 7594 RMD160 32bf5c0b3a1afd152b0a53c522b53c239416e9c4 SHA1 99a89786fc3bcf1b6c2450ebc170fb2b8aa526fd SHA256 7c549edcad4bbc562060bed06dcac5d322b6044a28447642b80ae1c6b89e9ef4
 AUX grilo-plugins-0.1.16-youtube-missing-case.patch 675 RMD160 47fc101f2d1da763be0a416c2fda2d22f28413ad SHA1 87b68e25d73d2badb64de8bae1708bdb2e7732f8 SHA256 2f01381b9819fff8776adf8ca75e1e34c065c71ab585f45b62eba3f9d00df9cf
 AUX grilo-plugins-0.1.16-youtube-variable-shadowing.patch 975 RMD160 45384db143019ac44b2f30e8537b93f1036dfb8a SHA1 20e4bada9ef0299672b37adcf1b933474a2c030b SHA256 52ec21d08e7c227cac0f1a8c7da9cd78d8999ab5454863219ee96baf17047f65
-DIST grilo-plugins-0.1.15.tar.bz2 358927 RMD160 09e7e66b99093117adca7a5915bc73556c1ee6c9 SHA1 ff93b6d4ddd5c65739c24474f393cdb7d2369e49 SHA256 2ceaf7159e16c8253159e8e0493fff4cdddde815e34ad7de5e63aa522210bf45
+AUX grilo-plugins-0.1.17-apple-trailers-fix.patch 961 RMD160 0c2130b6e77881ddf09934f26e7658dd2fc9298d SHA1 d267e10f709d92ca254cd2cde98abe177889a45f SHA256 0679729aa53a1545dd49f3e055d5bc01364464ac4a749164e26904ab83959d05
 DIST grilo-plugins-0.1.16.tar.xz 355300 RMD160 32e05fc643054e254909e28b019b65f625b10b19 SHA1 3542560351371f49d48ca6d87f47730ec9e503f4 SHA256 d37c5f49cd9655cabff425588214a67eb0c4643c7b87dadf492ad37ba69ab8d8
-EBUILD grilo-plugins-0.1.15.ebuild 1596 RMD160 4675fa478b805ca7699e4e585b4051b2a06a45fd SHA1 c631f90916ad9fa9026695a348ce77cabb6a4842 SHA256 0c2f40607966f96127265ba7bc1d976367e6798385927945f617cef35fbf4e93
+DIST grilo-plugins-0.1.17.tar.xz 374436 RMD160 cd1d84573ebc8c7e0e7bf25947dd8522c5d155a0 SHA1 2b6ae8200e306626e74561e3cbc1d3b902f5182e SHA256 c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a
 EBUILD grilo-plugins-0.1.16.ebuild 1964 RMD160 a583461ed51728d6bfe7ed514d952df19ff82a04 SHA1 e1714e69f3eee36cea428b6ce95b2d3f21b26fba SHA256 74bc82f8cc1d262e6ce25e3e78ec2e39bcf05e3b32f13f74f844895eb85381cb
-MISC ChangeLog 973 RMD160 9e5fec97758bbbb277f8ba409d016678bb0b0825 SHA1 a5eebf86a7ed7f73547aee09f6ac00e90cc87795 SHA256 b31e764ffb69d620ee4ba32cf0eccc84c8bdfc38b4b2346f5707b1a5599505e4
+EBUILD grilo-plugins-0.1.17.ebuild 1825 RMD160 e0731b60d757bad16f46406c05800e5367b58870 SHA1 8a27e0b03ae41ca5b14bce11ef85a6e90c6680f8 SHA256 4a50be7cddf825ecb299e4db570d7e20dd9e71d4cc5d6b4a803b30f7912eedfe
+MISC ChangeLog 1232 RMD160 b6514d0b1b819d26e182a5215ce439e3c8fb7fb0 SHA1 1e17e5081ec0bc4254595b3c64594ebe960a7793 SHA256 e20645cd8fac3b7dcc16cc6fa8dfa90dec14e616b03f84b529074540680bc3a2
 MISC metadata.xml 482 RMD160 cf4f1aefbd86ec1e60bca9701f030c85ee5e7d05 SHA1 5278ef0a538f5fa911f2f985bdaafa503f16dba6 SHA256 af37eba5ca44b4d9f6ae5f081c962c6469ddcbff09c78b63b6ed1e5a477c6deb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOR6j+AAoJEO/kOhxWD91kUDsP/AitJpX6001y5Z9A91STIkNA
-vPKNn4KoQBhKuoQozhKlsvxfXBt7gjD4CPrvDHn8R6kDmOJsw2ylzuHEkqgAt20V
-4DcTopdEXjE1uD7lYtu0xskDPDxNH4OKOItTooEIuEPm/xR2arLo1SLK080egdwB
-F22KAKJ0hScYWBLFvVokw/4FubM9nFJGg84YnMfIte3FXnq5Yo9otY4Mc5eD2z2b
-VnHXyxIdBG+52W0ZXJSwRWvsjXzZcKr04GW1dcGCPPhU6fko+gJCiiN3JhEcbAQ6
-0aYR6dNx0GKW9U+CZ29G1BOytVsQ9s58/hOixSDiRgSKhy/Ce5ixmQhWY8zv2Zem
-PWimbTtSSfTK7uuByEMHs9RqhphA91nsHYLg0K8ZG0F8nCyLUQL+IsY5qDzelaq4
-okwGRETF9uMFjAHwvJMI81vK8FZSfMzq9+6+7eEyCRfRuu8BjAoMO2bvIUYwWWL7
-dY4OkR01DD9UuD/7OXjANgmMkeC+uwJpwUoo5y62vIdRDQVc8SLza6T+gkJiNOIi
-K2tnFYzkL8Ax/JGZeNUVb43aofiKLgqpEJHtSzlL3J92aS+mnCUSjrFK6lou9qkF
-7xbDUwlp72P1VBuJLT1hVDjArmVT1VxhoMjj7yixz3QJKfoxDTgbopQ3gX4PNeUy
-RRvdslvYslvthhLvD3dx
-=XL31
+iQIcBAEBAgAGBQJOh0DkAAoJEO/kOhxWD91kHJ4P/1tirm809TZIljmapyyxE51D
+sCqxm+JKl7YOdaOzQmKGz559iqj9tSnK2dsaxfKVreKPIfgFyKPcrMbCl0vrtNdR
++GyMHBF3vB0hk1IoOVJu+2oRm5ppq0QE2E0Ef3YM4hXK96uT9c5R+OxK+U3792o4
+ctG/PkShBlWq994NKW8uml17zXQyaecOjxA5s1PTInI10Anx0bVueWl0jEZWf7rz
+JCT9UZVWrLvi/YASKX8evcS4ZKMfcRGEUxCPYLWQ6MJFNusVoEnVLfQyvBsh5fSu
+VMFsHMKJ5aw8a6hE1g0pwKmc1rP7hmUmmMhOXGQoDSUFWp20h+XAQQJuDUk1/3U3
+JE4tFZAninfLXdK1CcjPbzpCFeIvIo/p4Tp0n7NoV9RWSIh6T3OtAvPrCt+L0Pop
+zueh865M9PPjJ2lBufXBtZB8N0nHu3RxeEmpWwzfVz8qg/KaplPxiX4eZ/ypWQtR
+OMjj9ivsrMdPLemDqvWOrOLSBpW3YJWffaU+5HmlbxZUI1BNdZAq55YeGDj5r05t
+4x6Kc4DWdmOHhYEYpC2+XPjbTIueGBqaHjoou3QWMKzOzhfEDJCsuSVqlfKf/op2
+5S8CB24e/xwx8tP7yKyGDswKGiOMWaJpZI8BZR+nOjHPpdUnAYRAA68aHbRaA81y
+IN9dxdVwCeBJcNv6HlvK
+=ziUF
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-apple-trailers-fix.patch b/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-apple-trailers-fix.patch
new file mode 100644
index 000000000000..5cfec86afc86
--- /dev/null
+++ b/media-plugins/grilo-plugins/files/grilo-plugins-0.1.17-apple-trailers-fix.patch
@@ -0,0 +1,28 @@
+From a68da37a138c6dfa4af73bec94a628988f79f3a0 Mon Sep 17 00:00:00 2001
+From: Juan A. Suarez Romero <jasuarez@igalia.com>
+Date: Wed, 07 Sep 2011 18:08:22 +0000
+Subject: apple-trailers: set mime-type
+
+Mime-type is set to "video/mp4".
+
+From the webpage, seems the .mov files have this mimetype.
+
+And .m4v has usually this mimetype too.
+
+Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
+---
+diff --git a/src/media/apple-trailers/grl-apple-trailers.c b/src/media/apple-trailers/grl-apple-trailers.c
+index 949f188..9977094 100644
+--- a/src/media/apple-trailers/grl-apple-trailers.c
++++ b/src/media/apple-trailers/grl-apple-trailers.c
+@@ -361,6 +361,8 @@ build_media_from_movie (xmlNodePtr node, gboolean xlarge)
+   grl_media_set_certificate (media, movie_rating);
+   grl_media_set_studio (media, movie_studio);
+ 
++  grl_media_set_mime (media, "video/mp4");
++
+   /* FIXME: Translation */
+   grl_media_set_license (media, movie_copyright);
+ 
+--
+cgit v0.9.0.2
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.1.15.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.1.17.ebuild
index 8b4fc8d441b1..07e2e6f3b93c 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.1.15.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.1.17.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2011 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.15.ebuild,v 1.2 2011/06/15 16:43:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/grilo-plugins/grilo-plugins-0.1.17.ebuild,v 1.1 2011/10/01 16:33:37 nirbheek Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
@@ -20,10 +19,12 @@ RDEPEND="
 	>=dev-libs/glib-2.26:2
 	=media-libs/grilo-${PV}[network]
 
+	|| ( dev-libs/gmime:2.6 dev-libs/gmime:2.4 )
 	dev-libs/libxml2:2
 	dev-db/sqlite:3
 
-	youtube? ( >=dev-libs/libgdata-0.4.0 )
+	youtube? ( >=dev-libs/libgdata-0.7
+		>=media-libs/quvi-0.2.15 )
 	upnp? ( >=net-libs/gupnp-0.13
 		>=net-libs/gupnp-av-0.5 )
 	vimeo? ( net-libs/libsoup:2.4
@@ -44,20 +45,22 @@ pkg_setup() {
 		--disable-uninstalled"
 
 	# Plugins
-	# TODO: Enable tracker support
+	# TODO: Enable tracker support (requires tracker-0.10.5+)
+	# TODO: Enable Blip.TV support (requires librest)
 	G2CONF="${G2CONF}
+		--enable-apple-trailers
+		--enable-bookmarks
 		--enable-filesystem
+		--enable-flickr
+		--enable-gravatar
 		--enable-jamendo
 		--enable-lastfm-albumart
-		--enable-flickr
+		--enable-localmetadata
+		--enable-metadata-store
 		--enable-podcasts
-		--enable-bookmarks
+		--disable-bliptv
 		--disable-shoutcast
-		--enable-apple-trailers
-		--enable-metadata-store
-		--enable-gravatar
 		--disable-tracker
-		--enable-localmetadata
 		$(use_enable upnp)
 		$(use_enable youtube)
 		$(use_enable vimeo)"
@@ -65,5 +68,10 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i -e 's/^\(SUBDIRS .*\)test/\1/g' Makefile.*
+
+	epatch "${FILESDIR}/${P}-apple-trailers-fix.patch"
+
+	eautoreconf
+
 	gnome2_src_prepare
 }