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

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 126 insertions, 3 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/Manifest b/media-plugins/vdr-vodcatcher/Manifest
index 510206214f83..dc8be95be4bf 100644
--- a/media-plugins/vdr-vodcatcher/Manifest
+++ b/media-plugins/vdr-vodcatcher/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-vodcatcher-0.2.1-gcc44.patch 374 RMD160 4e611d7075559f58b181af4e538e293dd85e8951 SHA1 bceed9ce054a3e9a344793a7b92767a2e0cfb139 SHA256 51646cd82f149d918b55f432b21ea3fadbffcd25fa4e3b9c7c04edea203a73f1
+AUX vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff 1638 RMD160 4ddf9fbe5a0d83299fa6df26cf81e16370d44126 SHA1 a95419301805984e88c5f158197ce840cd6d0170 SHA256 63ab88c70acc0fdd86e13c5d086cab5fdab6403722deb708a4e039950ba64015
 DIST vdr-vodcatcher-0.1.1.tar.gz 126352 RMD160 ca80423d1de60a034cf1bca8ab3aeca9468c2290 SHA1 a43391c89936c42fc471330d21163ba78de86114 SHA256 3f85b2bdd2aec116ee9bbf6e22af5dc5998221496bea443d7ef0e756e201678e
 DIST vdr-vodcatcher-0.2.1.tar.gz 127579 RMD160 1278d2f8be9c9085b89ca48774ce55581ff2f025 SHA1 ceedc4abb3d1da867cd4a8d6fa9a254ff9842cde SHA256 e0e3ee03bc577e22662df04f84f0dbdcaa75cc6d66d65aace15158feff01dff6
+DIST vdr-vodcatcher-0.2.2.tar.gz 126612 RMD160 848a6bd31df6b67073cc5ad1f3fc22b43fa428ba SHA1 ce3f16f25ab499da9f234b932e6746e68dfa42f0 SHA256 85f728a5eecc5845d3bb18c97ff96c65ec2cb5653dcf24fb8be604d8c02adf32
 EBUILD vdr-vodcatcher-0.1.1.ebuild 1204 RMD160 6c355cd6f86ca6419b5fbb6d1f5f028f402e4fca SHA1 8eb1c220b3df88672160e2387cc10c4b527e58c1 SHA256 258e9d985451bf05a7833a4448b6db2e0ea6eb2b4df47e30c06ef234a3b01194
 EBUILD vdr-vodcatcher-0.2.1.ebuild 1287 RMD160 65d8a1ed6a445a53f5e059dffc4b702a1547a37d SHA1 16b36464279b348ce23ed5166791185e086e9395 SHA256 1974c511c37dceceb06896d1d10bf06fffc07e29eeb071dbdd173086d2697c66
-MISC ChangeLog 826 RMD160 2dee904a6018904ea3b921130593fba0cba7859d SHA1 d88b2ce7519d0add61766ba76569232881fbf25a SHA256 1eeb6f63cae68a74b0157e02f9d5c6b8436e4a2ddbe6aac4baa6cb0aceafebe8
+EBUILD vdr-vodcatcher-0.2.2.ebuild 1373 RMD160 a3a1b58e94d67eb6acf8dac415d3a23f25fc4ca2 SHA1 0ffc378fe059abec940844c96b53546b96701953 SHA256 1259cbd5336bfc6f80c4e46cb500ec02ce0be7f36faf79be0d985f7ef9fbdaba
+MISC ChangeLog 1095 RMD160 4db3f7328943822b8159647e10309e403e660112 SHA1 ca670fdf306ec0f797c5196168bd8d08755802e3 SHA256 6036f4976d186c3b1f01f345e80346f8020de1734107ef2d320519331ac0f4bc
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFMmm2edn07HTTCgIoRAm2fAJ9NnBpRH0zwfuPLJfEUiLY8xAMscACeNpEw
+uiMqHccTtVrCIYqY2H3Z7Ok=
+=8jKB
+-----END PGP SIGNATURE-----
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
+}