clean up; stable on x86; added fix for missing epg on some direkt feeds; fix wrong sed call in Makefile

(Portage version: 2.1.3.19)

8 files changed, 27 insertions, 163 deletions

diff --git a/media-plugins/vdr-premiereepg/ChangeLog b/media-plugins/vdr-premiereepg/ChangeLog
index 922bf50a4b6d..70c9759bb993 100644
--- a/media-plugins/vdr-premiereepg/ChangeLog
+++ b/media-plugins/vdr-premiereepg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-premiereepg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-premiereepg/ChangeLog,v 1.8 2007/10/28 16:27:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-premiereepg/ChangeLog,v 1.9 2007/12/26 10:57:07 hd_brummy Exp $
+
+  26 Dec 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-premiereepg-0.0.6-fix-epg.patch,
+  +files/vdr-premiereepg-0.0.8-fix-epg.patch,
+  -vdr-premiereepg-0.0.6-r1.ebuild, -vdr-premiereepg-0.0.7.ebuild,
+  vdr-premiereepg-0.0.8.ebuild:
+  clean up; stable on x86; added fix for missing epg on some direkt feeds; fix
+  wrong sed call in Makefile
 
 *vdr-premiereepg-0.0.8 (28 Oct 2007)
 
diff --git a/media-plugins/vdr-premiereepg/files/digest-vdr-premiereepg-0.0.6-r1 b/media-plugins/vdr-premiereepg/files/digest-vdr-premiereepg-0.0.6-r1
deleted file mode 100644
index 894a7a5d46ab..000000000000
--- a/media-plugins/vdr-premiereepg/files/digest-vdr-premiereepg-0.0.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bfd7a44db57213af63f3932876f7f144 vdr-premiereepg-0.0.6.tar.gz 13921
-RMD160 746e046b1eb0423a9a1942036d41f5f57c9ebfbb vdr-premiereepg-0.0.6.tar.gz 13921
-SHA256 9c867a41202e1588328c590cbd8f50026cb6048ac4bfac7fdeb7a93e9e10b6fd vdr-premiereepg-0.0.6.tar.gz 13921
diff --git a/media-plugins/vdr-premiereepg/files/digest-vdr-premiereepg-0.0.7 b/media-plugins/vdr-premiereepg/files/digest-vdr-premiereepg-0.0.7
deleted file mode 100644
index f81719ca77e0..000000000000
--- a/media-plugins/vdr-premiereepg/files/digest-vdr-premiereepg-0.0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 41130fcbd726b6107698f4074f7f5ebb vdr-premiereepg-0.0.7.tar.gz 14192
-RMD160 b6b06b8040ab03006e938e9987d272ebee664318 vdr-premiereepg-0.0.7.tar.gz 14192
-SHA256 8825880f5bbe4f41ea6e1f896b816b0e00c6513c8e23925f3546e18c398b06cd vdr-premiereepg-0.0.7.tar.gz 14192
diff --git a/media-plugins/vdr-premiereepg/files/vdr-premiereepg-0.0.6-fix-epg.patch b/media-plugins/vdr-premiereepg/files/vdr-premiereepg-0.0.6-fix-epg.patch
deleted file mode 100644
index ac25b14c5e97..000000000000
--- a/media-plugins/vdr-premiereepg/files/vdr-premiereepg-0.0.6-fix-epg.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -urN premiereepg-0.0.6/premiereepg.c premiereepg/premiereepg.c
---- premiereepg-0.0.6/premiereepg.c	2006-06-05 18:11:34.000000000 +0200
-+++ premiereepg/premiereepg.c	2006-08-08 23:26:16.000000000 +0200
-@@ -73,6 +73,7 @@
-   int OptPat;
-   int OrderInfo;
-   int RatingInfo;
-+  int FixEpg;
- public:
-   cSetupPremiereEpg(void);
-   };
-@@ -84,6 +85,7 @@
-   OptPat=1;
-   OrderInfo=1;
-   RatingInfo=1;
-+  FixEpg=0;
- }
- 
- // --- i18n --------------------------------------------------------------------
-@@ -296,6 +298,23 @@
-     "", // TODO
-     "", // TODO
-   },
-+  { "Fix EPG data",
-+    "EPG Daten korrigieren",
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+    "", // TODO
-+  },
- 
-   { NULL }
-   };
-@@ -325,6 +344,7 @@
-   Add(new cMenuEditStraItem(tr("Tag option events"),&data.OptPat,NUM_PATS,optDisp));
-   Add(new cMenuEditBoolItem(tr("Show order information"),&data.OrderInfo));
-   Add(new cMenuEditBoolItem(tr("Show rating information"),&data.RatingInfo));
-+  Add(new cMenuEditBoolItem(tr("Fix EPG data"),&data.FixEpg));
- }
- 
- void cMenuSetupPremiereEpg::Store(void)
-@@ -333,6 +353,7 @@
-   SetupStore("OptionPattern",SetupPE.OptPat);
-   SetupStore("OrderInfo",SetupPE.OrderInfo);
-   SetupStore("RatingInfo",SetupPE.RatingInfo);
-+  SetupStore("FixEpg",SetupPE.FixEpg);
- }
- 
- // --- CRC16 -------------------------------------------------------------------
-@@ -575,7 +596,19 @@
-         crc[0]=cit.getContentId();
-         SI::PremiereContentTransmissionDescriptor *pct;
-         for(SI::Loop::Iterator it; (pct=(SI::PremiereContentTransmissionDescriptor *)cit.eventDescriptors.getNext(it,SI::PremiereContentTransmissionDescriptorTag)); ) {
--          tChannelID channelID(Source(),pct->getOriginalNetworkId(),pct->getTransportStreamId(),pct->getServiceId());
-+          int nid=pct->getOriginalNetworkId();
-+          int tid=pct->getTransportStreamId();
-+          int sid=pct->getServiceId();
-+          if(SetupPE.FixEpg) {
-+            if(nid==133) {
-+	      if     (tid==0x03 && sid==0xf0) { tid=0x02; sid=0xe0; }
-+	      else if(tid==0x03 && sid==0xf1) { tid=0x02; sid=0xe1; }
-+	      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; }
-+              }
-+            }
-+          tChannelID channelID(Source(),nid,tid,sid);
-           cChannel *channel=Channels.GetByChannelID(channelID,true);
-           if(!channel) continue;
- 
-@@ -742,6 +775,7 @@
-   if      (!strcasecmp(Name, "OptionPattern")) SetupPE.OptPat     = atoi(Value);
-   else if (!strcasecmp(Name, "OrderInfo"))     SetupPE.OrderInfo  = atoi(Value);
-   else if (!strcasecmp(Name, "RatingInfo"))    SetupPE.RatingInfo = atoi(Value);
-+  else if (!strcasecmp(Name, "FixEpg"))        SetupPE.FixEpg     = atoi(Value);
-   else return false;
-   return true;
- }
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
new file mode 100644
index 000000000000..060c494eef43
--- /dev/null
+++ b/media-plugins/vdr-premiereepg/files/vdr-premiereepg-0.0.8-fix-epg.patch
@@ -0,0 +1,13 @@
+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.6-r1.ebuild b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.6-r1.ebuild
deleted file mode 100644
index cce7f393aaa7..000000000000
--- a/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 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.6-r1.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR Plugin: The plugin parses the extended EPG data which is send by 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="x86 ~amd64"
-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
-}
-
-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.0.7.ebuild b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.7.ebuild
deleted file mode 100644
index 19717c5a924a..000000000000
--- a/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 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.7.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR Plugin: The plugin parses the extended EPG data which is send by 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}"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd ${S}
-	fix_vdr_libsi_include premiereepg.c
-}
-
-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.0.8.ebuild b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.8.ebuild
index 53c2e518269e..1fe682bc585b 100644
--- a/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.8.ebuild
+++ b/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1 2007/10/28 16:27:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-premiereepg/vdr-premiereepg-0.0.8.ebuild,v 1.2 2007/12/26 10:57:07 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -10,18 +10,21 @@ 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}"
 
+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() {