clean up; rssreader-1.0.3 stable on x86; version bump

(Portage version: 2.1.4.4)

6 files changed, 33 insertions, 85 deletions

diff --git a/media-plugins/vdr-rssreader/ChangeLog b/media-plugins/vdr-rssreader/ChangeLog
index db8fb500a676..ee33b50e3d88 100644
--- a/media-plugins/vdr-rssreader/ChangeLog
+++ b/media-plugins/vdr-rssreader/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-plugins/vdr-rssreader
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.4 2008/01/20 21:06:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.5 2008/03/24 10:10:42 hd_brummy Exp $
+
+*vdr-rssreader-1.1.4 (24 Mar 2008)
+
+  24 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-rssreader-1.0.1-gentoo.diff,
+  -files/vdr-rssreader-1.0.1-gentoo-rss.diff,
+  -files/vdr-rssreader-1.0.1-vdr-1.5.3.diff,
+  +files/vdr-rssreader-1.1.4-gentoo.diff,
+  +files/vdr-rssreader-1.1.4-gentoo-rss.diff, -vdr-rssreader-1.0.1.ebuild,
+  vdr-rssreader-1.0.3.ebuild, +vdr-rssreader-1.1.4.ebuild:
+  clean up; rssreader-1.0.3 stable on x86; version bump
 
 *vdr-rssreader-1.0.3 (20 Jan 2008)
 
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-vdr-1.5.3.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-vdr-1.5.3.diff
deleted file mode 100644
index 7c2f244065e7..000000000000
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-vdr-1.5.3.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_rssreader-1.0.1-1.5.3.dpatch by Thomas Günther <tom@toms-cafe.de>
-## http://toms-cafe.de/vdr/download/rssreader-1.0.1-1.5.3.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.3.
-
-@DPATCH@
---- rssreader-1.0.1/parser.c
-+++ rssreader-1.0.1/parser.c
-@@ -51,7 +51,11 @@ void cItem::SetDate(const char *str)
-   char tmp[SHORT_TEXT_LEN];
-   memset(tmp, 0, sizeof(tmp));
- 
-+#if APIVERSNUM >= 10503
-+  charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", cCharSetConv::SystemCharacterTable());
-+#else
-   charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", I18nCharSets()[Setup.OSDLanguage]);
-+#endif
-   compactspace(tmp);
-   debug("cItem::SetDate(): Date: '%s'", tmp);
-   strn0cpy(date, tmp, sizeof(tmp));
-@@ -62,7 +66,11 @@ void cItem::SetTitle(const char *str)
-   char tmp[SHORT_TEXT_LEN];
-   memset(tmp, 0, sizeof(tmp));
- 
-+#if APIVERSNUM >= 10503
-+  charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", cCharSetConv::SystemCharacterTable());
-+#else
-   charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", I18nCharSets()[Setup.OSDLanguage]);
-+#endif
-   compactspace(tmp);
-   striphtml(tmp);
-   htmlcharconv(tmp);
-@@ -75,7 +83,11 @@ void cItem::SetLink(const char *str)
-   char tmp[SHORT_TEXT_LEN];
-   memset(tmp, 0, sizeof(tmp));
- 
-+#if APIVERSNUM >= 10503
-+  charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", cCharSetConv::SystemCharacterTable());
-+#else
-   charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", I18nCharSets()[Setup.OSDLanguage]);
-+#endif
-   compactspace(tmp);
-   debug("cItem::SetLink(): '%s'", tmp);
-   strn0cpy(link, tmp, sizeof(tmp));
-@@ -86,7 +98,11 @@ void cItem::SetDescription(const char *s
-   char tmp[LONG_TEXT_LEN];
-   memset(tmp, 0, sizeof(tmp));
- 
-+#if APIVERSNUM >= 10503
-+  charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", cCharSetConv::SystemCharacterTable());
-+#else
-   charsetconv(tmp, sizeof(tmp), str, strlen(str), "UTF8", I18nCharSets()[Setup.OSDLanguage]);
-+#endif
-   compactspace(tmp);
-   striphtml(tmp);
-   htmlcharconv(tmp);
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-gentoo-rss.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo-rss.diff
index 11abfcd478c8..1b9d3c6ebb63 100644
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-gentoo-rss.diff
+++ b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo-rss.diff
@@ -1,22 +1,18 @@
 diff -Naur rssreader-1.0.1.orig/example/rssreader.conf rssreader-1.0.1/example/rssreader.conf
 --- rssreader-1.0.1.orig/example/rssreader.conf	2006-11-07 20:13:31.369876894 +0100
 +++ rssreader-1.0.1/example/rssreader.conf	2006-11-07 20:32:56.172255198 +0100
-@@ -1,6 +1,11 @@
+@@ -1,6 +1,9 @@
  # Configuration file for RssReader plugin (VDR)
  # "Label" : # Comment
  # "Title" : "URL"
 +-- Gentoo				: # Label
 +VDR Project Overlay		: http://overlays.gentoo.org/proj/vdr/timeline?changeset=on&wiki=on&max=50&daysback=90&format=rss
-+Gentoo portage (x86)   : http://packages.gentoo.org/archs/x86/gentoo.rss
-+Gentoo portage (AMD86) : http://packages.gentoo.org/archs/amd64/gentoo.rss
-+Gentoo portage (PPC)   : http://packages.gentoo.org/archs/ppc/gentoo.rss
++Gentoo                 : http://www.gentoo.org/rdf/en/gentoo-news.rdf
  -- VDR                 : # Label
- VDR Announcements      : http://www.netholic.com/extras/vdr_announce_rss.php?num=10
- HTPC foorumi           : http://www.netholic.com/rss.php
-@@ -74,6 +79,3 @@
+ VDR Announcements      : http://www.linuxtv.fi/extras/vdr_announce_rss.php?num=10
+ Linuxtv.fi foorumi     : http://www.linuxtv.fi/rss.php
+@@ -75,4 +75,3 @@
  LKML Linus Torvalds    : http://lkml.org/groupie.php?author=Linus+Torvalds
  LKML Andrew Morton     : http://lkml.org/groupie.php?author=Andrew+Morton
  LKML Ingo Molnar       : http://lkml.org/groupie.php?author=Ingo+Molnar
--Gentoo portage (x86)   : http://packages.gentoo.org/archs/x86/gentoo.rss
--Gentoo portage (AMD86) : http://packages.gentoo.org/archs/amd64/gentoo.rss
--Gentoo portage (PPC)   : http://packages.gentoo.org/archs/ppc/gentoo.rss
+-Gentoo                 : http://www.gentoo.org/rdf/en/gentoo-news.rdf
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-gentoo.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo.diff
index 058918c55c70..051baa035ade 100644
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.1-gentoo.diff
+++ b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo.diff
@@ -2,20 +2,20 @@ diff -rc rssreader-1.0.1.orig/example/rssreader.conf rssreader-1.0.1.mod/example
 *** rssreader-1.0.1.orig/example/rssreader.conf	Sat Jul  1 03:20:00 2006
 --- rssreader-1.0.1.mod/example/rssreader.conf	Sun Oct 29 15:15:06 2006
 ***************
-*** 4,9 ****
---- 4,10 ----
-  -- VDR                 : # Label
-  VDR Announcements      : http://www.netholic.com/extras/vdr_announce_rss.php?num=10
-  HTPC foorumi           : http://www.netholic.com/rss.php
+*** 5,10 ****
+--- 5,11 ----
+  VDR Announcements      : http://www.linuxtv.fi/extras/vdr_announce_rss.php?num=10
+  Linuxtv.fi foorumi     : http://www.linuxtv.fi/rss.php
+  DVB.fi foorumi         : http://www.dvb.fi/external.php?type=rss
 + PizzakBlog             : http://pizzak.wordpress.com/feed/
   -- Kotimaiset          : # Label
   Lehti                  : http://lehti.samizdat.info/feed/rss2/
-  YLE                    : http://www.yle.fi/uutiset/rss/paauutiset.xml
+  Salakuunneltua         : http://www.salakuunneltua.fi/rss.php
 diff -rc rssreader-1.0.1.orig/rssreader.c rssreader-1.0.1.mod/rssreader.c
 *** rssreader-1.0.1.orig/rssreader.c	Sat Jul  1 03:20:00 2006
 --- rssreader-1.0.1.mod/rssreader.c	Sun Oct 29 15:06:10 2006
 ***************
-*** 94,100 ****
+*** 90,96 ****
   bool cPluginRssReader::Start(void)
   {
     // Start any background activities the plugin shall perform.
@@ -23,7 +23,7 @@ diff -rc rssreader-1.0.1.orig/rssreader.c rssreader-1.0.1.mod/rssreader.c
        error("configuration file 'rssreader.conf' not found!");
     return true;
   }
---- 94,100 ----
+--- 90,96 ----
   bool cPluginRssReader::Start(void)
   {
     // Start any background activities the plugin shall perform.
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild
index f63f051cc0dd..3da7b9c9a760 100644
--- a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild
+++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild,v 1.1 2008/01/20 21:06:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild,v 1.2 2008/03/24 10:10:42 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.38
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild
index df3f3574317c..56517500c6b4 100644
--- a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild
+++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.0.1.ebuild,v 1.5 2008/01/20 21:06:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild,v 1.1 2008/03/24 10:10:42 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -10,22 +10,21 @@ SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.38
+DEPEND=">=media-video/vdr-1.5.7
 		>=dev-libs/expat-1.95.8
 		>=net-misc/curl-7.15.1-r1"
 
 RDEPEND=""
 
 PATCHES="${FILESDIR}/${P}-gentoo.diff
-	${FILESDIR}/${P}-gentoo-rss.diff
-	${FILESDIR}/${P}-vdr-1.5.3.diff"
+	${FILESDIR}/${P}-gentoo-rss.diff"
 
 src_install() {
 	vdr-plugin_src_install
 
 	insinto /etc/vdr/plugins/rssreader
-	doins   "${S}"/example/rssreader.conf
+	doins "${S}/example/rssreader.conf"
 }