cleanup; eapi=4; vdr-plugin-2.eclass

(Portage version: 2.1.10.11/cvs/Linux i686)

5 files changed, 14 insertions, 113 deletions

diff --git a/media-plugins/vdr-vodcatcher/ChangeLog b/media-plugins/vdr-vodcatcher/ChangeLog
index b65079e91bd9..f31907cb05bc 100644
--- a/media-plugins/vdr-vodcatcher/ChangeLog
+++ b/media-plugins/vdr-vodcatcher/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-vodcatcher
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/ChangeLog,v 1.5 2012/04/24 10:20:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/ChangeLog,v 1.6 2012/05/01 12:30:14 hd_brummy Exp $
+
+  01 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-vodcatcher-0.1.1.ebuild, -vdr-vodcatcher-0.2.1.ebuild,
+  -files/vdr-vodcatcher-0.2.1-gcc44.patch, vdr-vodcatcher-0.2.2.ebuild:
+  cleanup; eapi=4; vdr-plugin-2.eclass
 
   24 Apr 2012; Michał Górny <mgorny@gentoo.org> vdr-vodcatcher-0.2.2.ebuild:
   Update to use mirror://.
diff --git a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.1-gcc44.patch b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.1-gcc44.patch
deleted file mode 100644
index b8c7ef6865b6..000000000000
--- a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.1-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur vodcatcher-0.2.1.orig/src/Rfc822DateTime.cc vodcatcher-0.2.1/src/Rfc822DateTime.cc
---- vodcatcher-0.2.1.orig/src/Rfc822DateTime.cc	2008-08-06 00:37:56.000000000 +0300
-+++ vodcatcher-0.2.1/src/Rfc822DateTime.cc	2009-08-11 12:26:49.000000000 +0300
-@@ -21,6 +21,7 @@
-  */
- 
- #include "Rfc822DateTime.h"
-+#include <stdio.h>
- #include <stdlib.h>
- 
- using namespace std;
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.1.1.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.1.1.ebuild
deleted file mode 100644
index 2ef5d204c6ec..000000000000
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 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.1.1.ebuild,v 1.1 2008/02/03 22:06:17 hd_brummy Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin"
-HOMEPAGE="http://www.e-tobi.net/blog/pages/vdr-vodcatcher"
-SRC_URI="http://www.e-tobi.net/blog/files/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/curl
-		media-video/vdr
-		media-plugins/vdr-mplayer"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	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
-}
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.1.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.1.ebuild
deleted file mode 100644
index 1c6b04aa77a4..000000000000
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 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.1.ebuild,v 1.2 2009/08/11 09:26:12 ssuominen Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin"
-HOMEPAGE="http://www.e-tobi.net/blog/pages/vdr-vodcatcher"
-SRC_URI="http://www.e-tobi.net/blog/files/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/curl
-		media-video/vdr
-		|| ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc44.patch" )
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	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
-}
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
index 4e87a08e5845..5095910c0e63 100644
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
+++ b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 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.2 2012/04/24 10:20:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild,v 1.3 2012/05/01 12:30:14 hd_brummy Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit vdr-plugin
+inherit vdr-plugin-2
 
 DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin"
 HOMEPAGE="http://projects.vdr-developer.org/projects/plg-vodcatcher"
@@ -17,19 +17,20 @@ IUSE=""
 
 DEPEND="net-misc/curl
 		>=dev-libs/tinyxml-2.6.1
-		media-video/vdr
+		media-video/vdr"
+RDEPEND="${DEPEND}
 		|| ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )"
 
 PATCHES=( "${FILESDIR}/${P}_unbundle-tinyxml2.diff" )
 
 src_prepare() {
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
 	sed -e "s:ConfigDirectory():ConfigDirectory( \"vodcatcher\" ):" -i src/VodcatcherPlugin.cc
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	insinto /etc/vdr/plugins/vodcatcher/
 	doins   examples/vodcatchersources.conf
@@ -39,7 +40,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	vdr-plugin_pkg_postinst
+	vdr-plugin-2_pkg_postinst
 
 	echo
 	elog "! IMPORTEND"