cleanup, eapi=2, minor ebuild fixes, description fixed, stable x86 amd64

(Portage version: 2.1.9.24/cvs/Linux i686)

4 files changed, 15 insertions, 58 deletions

diff --git a/media-plugins/vdr-premiereepg/ChangeLog b/media-plugins/vdr-premiereepg/ChangeLog
index dfda7cc1dbe7..54840bec32f5 100644
--- a/media-plugins/vdr-premiereepg/ChangeLog
+++ b/media-plugins/vdr-premiereepg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-premiereepg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-premiereepg/ChangeLog,v 1.11 2008/12/09 20:25:37 zzam Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-premiereepg/ChangeLog,v 1.12 2011/01/17 21:42:59 hd_brummy Exp $
+
+  17 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-premiereepg-0.0.8.ebuild, -files/vdr-premiereepg-0.0.8-fix-epg.patch,
+  vdr-premiereepg-0.2.0.ebuild:
+  cleanup, eapi=2, minor ebuild fixes, description fixed, stable x86 amd64
 
 *vdr-premiereepg-0.2.0 (09 Dec 2008)
 
diff --git a/media-plugins/vdr-premiereepg/files/vdr-premiereepg-0.0.8-fix-epg.patch b/media-plugins/vdr-premiereepg/files/vdr-premiereepg-0.0.8-fix-epg.patch
deleted file mode 100644
index 060c494eef43..000000000000
--- a/media-plugins/vdr-premiereepg/files/vdr-premiereepg-0.0.8-fix-epg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://www.vdr-portal.de/board/thread.php?postid=660980#post660980
-fix some missing epg infos on any Premiere-Direct feeds
-diff -Naur -- premiereepg-0.0.8.orig/premiereepg.c premiereepg-0.0.8/premiereepg.c
---- premiereepg-0.0.8.orig/premiereepg.c	2007-12-26 11:29:45.611133534 +0100
-+++ premiereepg-0.0.8/premiereepg.c	2007-12-26 11:31:38.310054659 +0100
-@@ -626,6 +626,7 @@
- 	      else if(tid==0x03 && sid==0xf5) { tid=0x03; sid=0xdc; }
- 	      else if(tid==0x04 && sid==0xd2) { tid=0x11; sid=0xe2; }
- 	      else if(tid==0x11 && sid==0xd3) { tid=0x11; sid=0xe3; }
-+          else if(tid==0x01 && sid==0xd4) { tid=0x04; sid=0xe4; }
-               }
-             }
-           tChannelID channelID(Source(),nid,tid,sid);
diff --git a/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.8.ebuild b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.8.ebuild
deleted file mode 100644
index dc5241592dd2..000000000000
--- a/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.8.ebuild
+++ /dev/null
@@ -1,35 +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-premiereepg/vdr-premiereepg-0.0.8.ebuild,v 1.3 2008/04/29 11:38:16 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR Plugin: Support the extended EPG which is sent by german paytv Premiere on their portal channels"
-HOMEPAGE="http://www.muempf.de/index.html"
-SRC_URI="http://www.muempf.de/down/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-# This plugin uses the libsi-code fixed in v1.4.0-3
-DEPEND=">=media-video/vdr-1.4.1"
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/${P}-fix-epg.patch")
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-	fix_vdr_libsi_include premiereepg.c
-	sed -i Makefile -e "s:i18n.c:i18n.h:"
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	ewarn "You should delete your existing /var/vdr/video/epg.data,"
-	ewarn "as the Handling of event-IDs has been changed in this release."
-}
diff --git a/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0.ebuild b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0.ebuild
index 41447b4ad5cd..24ad4a3330e5 100644
--- a/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0.ebuild
+++ b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0.ebuild,v 1.2 2008/12/31 03:36:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-premiereepg/vdr-premiereepg-0.2.0.ebuild,v 1.3 2011/01/17 21:42:59 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin eutils
 
-DESCRIPTION="VDR Plugin: Support the extended EPG which is sent by german paytv Premiere on their portal channels"
+DESCRIPTION="VDR Plugin: Support the extended EPG which is sent by german paytv Sky on their portal channels"
 HOMEPAGE="http://www.muempf.de/index.html"
 SRC_URI="http://www.muempf.de/down/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-# This plugin uses the libsi-code fixed in v1.4.0-3
 DEPEND=">=media-video/vdr-1.4.1"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	vdr-plugin_src_unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
-	cd "${S}"
 	fix_vdr_libsi_include premiereepg.c
 }