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

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

6 files changed, 22 insertions, 127 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/Manifest b/media-plugins/vdr-vodcatcher/Manifest
index 687877cf5b34..bae23e74c966 100644
--- a/media-plugins/vdr-vodcatcher/Manifest
+++ b/media-plugins/vdr-vodcatcher/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
-EBUILD vdr-vodcatcher-0.2.2.ebuild 1341 RMD160 cbada2192848b33577af48701d3339bfc5a84435 SHA1 45cc090238df50a9739a9275796c4a29e27450ca SHA256 4f2312a8047156871c542df7b54f0c7ee2fe52be0ca733585726b92f674b3f13
-MISC ChangeLog 1199 RMD160 b34de48dd115c3ad84c0d7606f0109f4691e7318 SHA1 42943d107da078662bee45a63695767f7f0056d5 SHA256 2856a40ecf374372cc548a56c3811518512bb559dc4b351c4956859c5bb9ad82
+EBUILD vdr-vodcatcher-0.2.2.ebuild 1372 RMD160 dbb46543f8496d64024742a7c177c6b6b94fc4c4 SHA1 49b9ee671995c86f983f0a8b849913cce9695c01 SHA256 4f7380d8a780c56dc6d6ad95c773a57789e45d8da6e49e5b490b645041010980
+MISC ChangeLog 1431 RMD160 eadffc196a329e1dac0d3304663f5a995d52b13b SHA1 9d1cf917086394bd0a2988d991c9bac6d945abb6 SHA256 1ce573551468808464bbc530a2df719b4370e4b2dfef1a860b6e9898ba2b01df
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iJwEAQEIAAYFAk+WfpMACgkQfXuS5UK5QB1u4AP/Xr/pSfEjkq8wrcFVBVD8MXbz
-ljTceG8Ejeftqq1/2ZUAXw/H6ArDDEdAuylUKwqwoiE7Ph9BYOpXoV7EuVCK1SsF
-AdWi6EsR17HDMja1BhKqn3KTwYHwmGognZKJM9mwmXxxLJ71ufj0f2UolhKHN5nv
-4O0MUGHeDX4ICk6n5Pk=
-=SFHN
+iD8DBQFPn9dgdn07HTTCgIoRAvTgAJ9DsBA+TnG41CzsLBE8ZK5xxZAAYACfWf1A
+zWoWnoXigrT/PevLxFdy9ig=
+=HUaA
 -----END PGP SIGNATURE-----
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"