version bump; eapi=2, new project page, patched to unbundle tinyxml code from sources

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 111 insertions, 2 deletions

diff --git a/media-plugins/vdr-vodcatcher/ChangeLog b/media-plugins/vdr-vodcatcher/ChangeLog
index a2c046f451e1..088634dc03ab 100644
--- a/media-plugins/vdr-vodcatcher/ChangeLog
+++ b/media-plugins/vdr-vodcatcher/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-vodcatcher
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/ChangeLog,v 1.3 2009/08/11 09:26:12 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/ChangeLog,v 1.4 2010/09/22 20:56:05 hd_brummy Exp $
+
+*vdr-vodcatcher-0.2.2 (22 Sep 2010)
+
+  22 Sep 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-vodcatcher-0.2.2.ebuild,
+  +files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff:
+  version bump; eapi=2, new project page, patched to unbundle tinyxml code
+  from sources
 
   11 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   vdr-vodcatcher-0.2.1.ebuild, +files/vdr-vodcatcher-0.2.1-gcc44.patch:
diff --git a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff
new file mode 100644
index 000000000000..0f79116cb346
--- /dev/null
+++ b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff
@@ -0,0 +1,50 @@
+diff -Naur vodcatcher-0.2.2.orig/Makefile vodcatcher-0.2.2/Makefile
+--- vodcatcher-0.2.2.orig/Makefile	2010-09-22 21:51:06.000000000 +0200
++++ vodcatcher-0.2.2/Makefile	2010-09-22 21:53:11.000000000 +0200
+@@ -50,8 +50,7 @@
+ ### Includes and Defines (add further entries here):
+ 
+ INCLUDES += -I. -I$(VDRDIR)/include -I$(DVBDIR)/include
+-INCLUDES += `curl-config --cflags` 
+-INCLUDES += -I./tinyxml
++INCLUDES += $(shell curl-config --cflags)
+ 
+ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ DEFINES += -DCXXTEST_ABORT_TEST_ON_FAIL 
+@@ -66,7 +65,8 @@
+ endif
+ 
+ # libcurl, libxml, libxml++
+-LIBS += `curl-config --libs`
++LIBS +=  -lcurl
++LIBS +=  -ltinyxml
+ 
+ ### The source files (add further files here):
+ 
+diff -Naur vodcatcher-0.2.2.orig/sources.mk vodcatcher-0.2.2/sources.mk
+--- vodcatcher-0.2.2.orig/sources.mk	2010-09-22 21:51:06.000000000 +0200
++++ vodcatcher-0.2.2/sources.mk	2010-09-22 21:53:22.000000000 +0200
+@@ -34,11 +34,6 @@
+   src/StreamType.cc \
+   src/SynchedDownloadPool.cc \
+   src/ThreadsafeDownloadPool.cc \
+-  tinyxml/tinystr.cpp \
+-  tinyxml/tinyxml.cpp \
+-  tinyxml/tinyxmlerror.cpp \
+-  tinyxml/tinyxmlparser.cpp \
+-  
+ 
+ SRCS_TESTONLY = \
+   src/DownloadCacheMock.cc \
+diff -Naur vodcatcher-0.2.2.orig/src/RssFeedParser.cc vodcatcher-0.2.2/src/RssFeedParser.cc
+--- vodcatcher-0.2.2.orig/src/RssFeedParser.cc	2010-09-22 21:51:06.000000000 +0200
++++ vodcatcher-0.2.2/src/RssFeedParser.cc	2010-09-22 21:53:44.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include "HtmlToText.h"
+ #include "Feed.h"
+ #include "IDownloadCache.h"
+-#include "tinyxml.h"
++#include <tinyxml.h>
+ #include "Item.h"
+ 
+ using namespace std;
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
new file mode 100644
index 000000000000..d82191c8b3fd
--- /dev/null
+++ b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild,v 1.1 2010/09/22 20:56:05 hd_brummy Exp $
+
+EAPI="2"
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-vodcatcher"
+SRC_URI="http://projects.vdr-developer.org/attachments/download/154/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-misc/curl
+		>=dev-libs/tinyxml-2.6.1
+		media-video/vdr
+		|| ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )"
+
+PATCHES=( "${FILESDIR}/${P}_unbundle-tinyxml2.diff" )
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	sed -e "s:ConfigDirectory():ConfigDirectory( \"vodcatcher\" ):" -i src/VodcatcherPlugin.cc
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	insinto /etc/vdr/plugins/vodcatcher/
+	doins   examples/vodcatchersources.conf
+
+	diropts -gvdr -ovdr
+	keepdir /var/cache/vdr-plugin-vodcatcher
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	echo
+	elog "! IMPORTEND"
+	elog "In order to allow the MPlayer plug-in to play back the streams passed in by the"
+	elog "Vodcatcher, you must add the following entry to the mplayersources.conf file:"
+	echo
+	elog "/tmp;Vodcatcher;0"
+	echo
+}