Version bump and remove old.

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

5 files changed, 9 insertions, 123 deletions

diff --git a/media-libs/quvi/ChangeLog b/media-libs/quvi/ChangeLog
index d418cec2fea8..bbe82607f706 100644
--- a/media-libs/quvi/ChangeLog
+++ b/media-libs/quvi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2011/03/30 20:48:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quvi/ChangeLog,v 1.23 2011/04/17 22:56:33 radhermit Exp $
+
+*quvi-0.2.15 (17 Apr 2011)
+
+  17 Apr 2011; Tim Harder <radhermit@gentoo.org> -quvi-0.2.14.ebuild,
+  -quvi-0.2.14-r1.ebuild, -files/quvi-0.2.14-docs.patch,
+  -files/quvi-0.2.14-youtube-video-ids.patch, +quvi-0.2.15.ebuild:
+  Version bump and remove old.
 
   30 Mar 2011; Tim Harder <radhermit@gentoo.org> quvi-0.2.14-r1.ebuild:
   Add dependency on >=sys-devel/autoconf-2.68 (bug #361261 by Pacho Ramos).
diff --git a/media-libs/quvi/files/quvi-0.2.14-docs.patch b/media-libs/quvi/files/quvi-0.2.14-docs.patch
deleted file mode 100644
index 522b8f059530..000000000000
--- a/media-libs/quvi/files/quvi-0.2.14-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 1ddd79cc6627..000000000000
--- a/media-libs/quvi/files/quvi-0.2.14-youtube-video-ids.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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.ebuild b/media-libs/quvi/quvi-0.2.14.ebuild
deleted file mode 100644
index 798618ee8eb9..000000000000
--- a/media-libs/quvi/quvi-0.2.14.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.ebuild,v 1.1 2011/03/11 04:26:46 radhermit Exp $
-
-EAPI=3
-
-inherit versionator
-
-DESCRIPTION="library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/$(get_version_component_range 1-2)/${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_configure() {
-	econf \
-		--without-doc \
-		$(use_enable examples) \
-		$(use_enable offensive nsfw) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README || die "dodoc failed"
-	use doc && dodoc doc/How*
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/quvi/quvi-0.2.14-r1.ebuild b/media-libs/quvi/quvi-0.2.15.ebuild
index 96e0b1fc307e..1a63e87f22bb 100644
--- a/media-libs/quvi/quvi-0.2.14-r1.ebuild
+++ b/media-libs/quvi/quvi-0.2.15.ebuild
@@ -1,11 +1,9 @@
 # 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.2 2011/03/30 20:48:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quvi/quvi-0.2.15.ebuild,v 1.1 2011/04/17 22:56:33 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"
@@ -18,19 +16,12 @@ IUSE="doc examples test offensive static-libs"
 RDEPEND=">=net-misc/curl-7.18.0
 	dev-lang/lua[deprecated]"
 DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.68
 	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 \