Revision bump. Update to EAPI 4, apply upstream patch to fix totem-pl-parser and youtube videos (bug #360643 by Pacho Ramos), use bash syntax instead of versionator eclass for SRC_URI, and remove empty doc directory.

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

5 files changed, 137 insertions, 9 deletions

diff --git a/media-libs/quvi/ChangeLog b/media-libs/quvi/ChangeLog
index cd9e39b1e24e..fd52235f0a36 100644
--- a/media-libs/quvi/ChangeLog
+++ b/media-libs/quvi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/quvi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quvi/ChangeLog,v 1.20 2011/03/13 21:00:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quvi/ChangeLog,v 1.21 2011/03/30 04:45:14 radhermit Exp $
+
+*quvi-0.2.14-r1 (30 Mar 2011)
+
+  30 Mar 2011; Tim Harder <radhermit@gentoo.org> +quvi-0.2.14-r1.ebuild,
+  +files/quvi-0.2.14-docs.patch, +files/quvi-0.2.14-youtube-video-ids.patch:
+  Revision bump. Update to EAPI 4, apply upstream patch to fix totem-pl-parser
+  and youtube videos (bug #360643 by Pacho Ramos), use bash syntax instead of
+  versionator eclass for SRC_URI, and remove empty doc directory.
 
   13 Mar 2011; Tim Harder <radhermit@gentoo.org> -quvi-0.2.11.ebuild,
   -quvi-0.2.12.ebuild:
diff --git a/media-libs/quvi/Manifest b/media-libs/quvi/Manifest
index 8ae30c7f666f..59e968473b5f 100644
--- a/media-libs/quvi/Manifest
+++ b/media-libs/quvi/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX quvi-0.2.14-docs.patch 336 RMD160 088466e104d1568d82d4be0cb4b80160b4c300ad SHA1 244d427ce506bb8b59b536a5ca464748733d6fd9 SHA256 c96f3cce34e71b51826e538ee61984aa64ba2c815db3c35fe79785201049a631
+AUX quvi-0.2.14-youtube-video-ids.patch 1502 RMD160 fcb2563612952d3f197792fd0c81b38cef4de1c1 SHA1 ec0095e85f5875b99dad0518047702743a2d5fa5 SHA256 317eec498a07348af4604d8fbd46d0c6ef070597b4e1b2059f931747279ae9f9
 DIST quvi-0.2.13.tar.bz2 398273 RMD160 a5a06238e8b305eeaafd5fe23a260e9525c3df55 SHA1 1d1086e4b6d47eb7ee550f49f82af3a7ac9a16e7 SHA256 b52ddba8fa34ce2ee2cf052afb40b0d7340f5c54cf2578ad76cd74548d21c0d7
 DIST quvi-0.2.14.tar.xz 310924 RMD160 8d454bf6d3bfe3a81e61e3f8aa3e80ade28a6dec SHA1 fdee4152fa19eeee3bf133e7827fd40c20304abd SHA256 5df7fac3fe7f0a5c1f073172d15263361014bbb96db68f78a5b172b36adde767
 EBUILD quvi-0.2.13.ebuild 1040 RMD160 48e3340b7713cffdd9645546644472183b946627 SHA1 fa038c5a1d4d0485a13510fdb76bd6a436c4dd2c SHA256 c9e170f72b374aad6f0c2fbc5a49979f9eb97c895c32b7c700df8d3f813f3a7f
+EBUILD quvi-0.2.14-r1.ebuild 1068 RMD160 27acc4fb5c5f8b00b21b64388e4fb46abca019c9 SHA1 a99704c5b4d54e85a12320b6deb241d02c29fd60 SHA256 221fd94e3d03d1d3637e2a0a204115a2e760a42e2760fa1092cf34601b3fc652
 EBUILD quvi-0.2.14.ebuild 1042 RMD160 9e6ff2ccacb8b01f508c7b896ba3d73d6a1a274b SHA1 6b762f1bcaf413bbee1cba3e1e288a24fa7abd63 SHA256 9cfd3cefcbe2b731469607b12dab6a74161544b235ad0be8bc2b1442ef79dbd0
-MISC ChangeLog 2834 RMD160 61ea82c33ae05d9888e4c50906c06c231de23305 SHA1 6de8457806f2a40c5ce16b55bbd84f12de58807e SHA256 59bfc556706403ae5a3e3ca8416965ae76f587c9df65bba33b0e706293e7a3c6
+MISC ChangeLog 3239 RMD160 88e34c7a25b9d1c124475374e937638539ac951f SHA1 34315df21fa65513d9748dffb4cd3a9c153a2529 SHA256 98024dc50e2d3131433e63366ff9270815c1d99efd7a659030b7a00bd95cc878
 MISC metadata.xml 229 RMD160 0af5af9226b7de79c22e1362142fc3401be67339 SHA1 db2f2f9573efd33f32bd5749a2ce6bfa2309ea13 SHA256 bd29c9f8577b59e107b6eb3b9f458bb507adfa71eea974920cb09b07add677fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNfTB5AAoJEEqz6FtPBkyjN20H/0XboX/Wz02gqEWRu4+mjDqs
-IZRllWN7KHLSLwFw9F9X6S1JKsELa5HfCUJIJEb5/aoa8H35TIeFUQOp6jazn/Ek
-52zR2ffbZPXpKbn2roTHHPdnUe5J6N9vYX9SFnQCXdGVBvbDOtfne3B2vZzyulvL
-IYu/CXKDp3mWwWQMoXc6CAISnhgdOekob4h6ZExfKG3ba5KNi198RJNUN8nNhkZ8
-MLK+hNq+J56D/+3WRBU+U4WUUfPfvse+l4LN/mzkOtrs786qlL0ktvZtOWZl0/Qr
-KxKbEjUdMeuznGIm4BbeTi89098hJsOpsVrpqIXNhuxvAuzl3W2UrEcBZAlRWdI=
-=+fWo
+iQEcBAEBAgAGBQJNkrVjAAoJEEqz6FtPBkyjIxAH/1Iqyha9I8xLdqXF5K+FpHuU
+crrjTVXuw/TY5I+G6X0upKzLfqQdehvv4hzwrrF+AJpVPUccexMd8SdmXej/p54m
+IIfQC4nA2lRISDvGyD8t/J6MvL37GkT/qRscDCUx89D6T5QhLTErvU38n7WJXqW1
+bSH4tYXWBTFzd22R5rV0e3aJW8IpP73dG3ubox/BObbNAa8U9JteNLxBs6ttG/8+
+q4anqNWHYLQ46Z6bD9lvfcku9B1ufkMDUt2x7HjLfeRRejuOBtGGSRbLQdTkcA6d
+pfSZT8auOG4XanNXsQx/GndkNWQEoUSr9nUlyc/73zvjsT4OFHAkGX74+XJJZk8=
+=Yv+/
 -----END PGP SIGNATURE-----
diff --git a/media-libs/quvi/files/quvi-0.2.14-docs.patch b/media-libs/quvi/files/quvi-0.2.14-docs.patch
new file mode 100644
index 000000000000..522b8f059530
--- /dev/null
+++ b/media-libs/quvi/files/quvi-0.2.14-docs.patch
@@ -0,0 +1,15 @@
+--- quvi-0.2.14/Makefile.am.orig
++++ quvi-0.2.14/Makefile.am
+@@ -10,7 +10,11 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libquvi.pc
+ 
+-SUBDIRS = include lib man1 src examples share doc scripts
++SUBDIRS = include lib man1 src examples share scripts
++
++if WITH_DOC
++SUBDIRS += doc
++endif
+ 
+ if ENABLE_TESTS
+ SUBDIRS += tests
diff --git a/media-libs/quvi/files/quvi-0.2.14-youtube-video-ids.patch b/media-libs/quvi/files/quvi-0.2.14-youtube-video-ids.patch
new file mode 100644
index 000000000000..1ddd79cc6627
--- /dev/null
+++ b/media-libs/quvi/files/quvi-0.2.14-youtube-video-ids.patch
@@ -0,0 +1,57 @@
+From 54fd2afbc1596cbb21a96adab89525ac65e06df4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 16 Mar 2011 23:56:19 +0000
+Subject: [PATCH] youtube: Only accept URLs with video IDs in them
+
+---
+ share/lua/website/youtube.lua |   23 +++++++++++++++++------
+ 1 files changed, 17 insertions(+), 6 deletions(-)
+
+--- a/share/lua/website/youtube.lua
++++ b/share/lua/website/youtube.lua
+@@ -45,17 +45,28 @@ local domains = {
+     "youtu.be"
+ }
+ 
+--- Check whether the domain is handled
+-function is_handled (page_url)
++-- Return the video ID
++function get_video_id (page_url)
+     if page_url == nil then
+-        return false
++        return nil
+     end
+     for k,domain in pairs(domains) do
+         if page_url:find(domain) ~= nil then
+-            return true
++            page_url = youtubify(page_url)
++            local _,_,s = page_url:find("v=([%w-_]+)")
++            return s
+         end
+     end
+-    return false
++    return nil
++end
++
++-- Check whether the domain is handled
++function is_handled (page_url)
++    local id = get_video_id(page_url)
++    if id == nil then
++        return false
++    end
++    return true
+ end
+ 
+ -- Identify the script.
+@@ -81,7 +92,7 @@ function parse (self)
+     self.host_id  = "youtube"
+     local page_url = youtubify(self.page_url)
+ 
+-    local _,_,s = page_url:find("v=([%w-_]+)")
++    local s = get_video_id(page_url)
+     self.id    = s or error ("no match: video id")
+ 
+     local _,_,s = page_url:find('#t=(.+)')
+-- 
+1.7.4.1
+
diff --git a/media-libs/quvi/quvi-0.2.14-r1.ebuild b/media-libs/quvi/quvi-0.2.14-r1.ebuild
new file mode 100644
index 000000000000..417d8567e46a
--- /dev/null
+++ b/media-libs/quvi/quvi-0.2.14-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quvi/quvi-0.2.14-r1.ebuild,v 1.1 2011/03/30 04:45:14 radhermit Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="library for parsing video download links"
+HOMEPAGE="http://quvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc examples test offensive static-libs"
+
+RDEPEND=">=net-misc/curl-7.18.0
+	dev-lang/lua[deprecated]"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+# tests fetch data from live websites, so it's rather normal that they
+# will fail
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-youtube-video-ids.patch \
+		"${FILESDIR}"/${P}-docs.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-doc \
+		$(use_enable examples) \
+		$(use_enable offensive nsfw) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use doc && dodoc doc/How*
+	find "${D}" -name '*.la' -delete
+}