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

Package-Manager: portage-2.1.4.4

7 files changed, 50 insertions, 92 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/Manifest b/media-plugins/vdr-rssreader/Manifest
index faaab3e0e384..78cd10b572d5 100644
--- a/media-plugins/vdr-rssreader/Manifest
+++ b/media-plugins/vdr-rssreader/Manifest
@@ -1,11 +1,21 @@
-AUX vdr-rssreader-1.0.1-gentoo-rss.diff 1376 RMD160 319428fc529302ddbee82ba2230bf7496de70767 SHA1 3ae83753ed85771160001cb6eb26a79f4793241d SHA256 72b5cc421ccf06eaaebe69e152f534a09af5c8ff5891caaf45707e6e3f078dad
-AUX vdr-rssreader-1.0.1-gentoo.diff 1485 RMD160 4bd939a450e45d1d9bc404661dc2ef8b7eebb833 SHA1 fb051a5d7a37b354a8ec21d6a4219f6ebb0fec11 SHA256 e22ac68e76763e022b99e0e2609dc57c2e4650c410b1a089ee50075de9f54e91
-AUX vdr-rssreader-1.0.1-vdr-1.5.3.diff 2092 RMD160 8fba2351138152a31acfd0c0e3b7063619b2f913 SHA1 a961ca60c2804b549dab8b50f90b73c42f2a5dfb SHA256 25dade4005ab533da53d2139d50fe87986def1d08816022ea15a2edf8e046a35
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-rssreader-1.0.3-gentoo-rss.diff 854 RMD160 adc795fa57c4190c2b1f6163ae594d566d8c7948 SHA1 329ce124ded4186d5ad1ee92056be8e145ddea9c SHA256 4711a73409fbff90e8770258c75c11c0eaf8aa38bf1a9fb910120aae7bc4ea3c
 AUX vdr-rssreader-1.0.3-gentoo.diff 1247 RMD160 e2e2a6e091958bd87c3ed7b7b225c4154d37ddf6 SHA1 953fb2b6ea9f83d97aedb2c6aa232177f1aad08c SHA256 aebe4c9f25a87c043b75f3ee1dca0fff26c64346655f7705078464f023bc15b5
-DIST vdr-rssreader-1.0.1.tgz 19965 RMD160 a339de2c5d3748fa64360ecf7f8c505a780544db SHA1 93e0257c4d871e0d7a3665f519f5a85cc732b317 SHA256 3c98d47115803c0e17c4a847582b7d3c13e500e1652d4e3331efb3a93c9abe8b
+AUX vdr-rssreader-1.1.4-gentoo-rss.diff 1065 RMD160 290d57222cd1be85d97357f127d5315bd49052ca SHA1 409039d8691c787e5b05d0bdfeb689bc9f0016d2 SHA256 6ac687fb3ec7b53600253a2a576f0995e35f227ccb7d553035f9a9d10dcfe731
+AUX vdr-rssreader-1.1.4-gentoo.diff 1504 RMD160 2f282877677c1ea849ce8969014022d68347b7d6 SHA1 2a3a585c361875880f24eb7440c172b37d9003ce SHA256 374d441ae2c6afd01eb607c3c1c31ca422d72827d7628cd917d79488636c15b7
 DIST vdr-rssreader-1.0.3.tgz 20502 RMD160 7f0c2ae2a0ebc21ff18de23c5a5299e5ec766514 SHA1 d8d312e97496b1f73a1a5302394122676b3a591d SHA256 25fe55592163ae5b0eb01eadd9027c8e641368cf3fb29750843b3dfb80b9879e
-EBUILD vdr-rssreader-1.0.1.ebuild 825 RMD160 faf046eb1dbb1ed9b392bda85a47261c3c9359b3 SHA1 f92d374730ce752db8c5a6c7b6983608b3f925f7 SHA256 8d0d2e711d06ae3acd6b478ca082d9db45847331a044ff71846b092944df0f6c
-EBUILD vdr-rssreader-1.0.3.ebuild 793 RMD160 b05cb29aad3cd4fd214c34b6d207f7be27986fad SHA1 7b5e5c6381c3801d5d52f43afc6860504c4449f7 SHA256 08c89fbc51b1e345ee0ef1e56204d1ab2c13551a05e51d6df88f235ff5066427
-MISC ChangeLog 1043 RMD160 c194eeafc37a7eaee87c98ef9992741c7053f33b SHA1 dd478f4a3eae696fb618927a8a1ba75abfde1ad8 SHA256 eb83315f5754ce4f6c488449b6fdf855818148d16f711827930686aaa1fd0126
+DIST vdr-rssreader-1.1.4.tgz 21412 RMD160 de39c64733043f2a1190fca182e80d45a1e664f5 SHA1 4bd86e96d08685092eb98982aea5467124cbdef4 SHA256 b9f46ec6e8620e36b9d51a662b3f49b66b8bb1e9e4001b1287a009d06d2b5ade
+EBUILD vdr-rssreader-1.0.3.ebuild 797 RMD160 03faab532436d0a30920f008f96709f57c4562f0 SHA1 fcde6597d323355074d3be8355980781b87b5b38 SHA256 c615b704f19186af0380bd5c9a243d05421a2e7c6fd4e9c4bf0aea4f3064e846
+EBUILD vdr-rssreader-1.1.4.ebuild 795 RMD160 a48f256cbfd34bb7855dadbdcde04c5d2d48112b SHA1 d9a957ea363bc22b324ab769f58d0d9ac6bb7507 SHA256 eb4d393aa0e52a1a2d6db01e161794ea55caac732f959c251c39c627550b3689
+MISC ChangeLog 1505 RMD160 ffb95621295855cb03ac111ea86792e7b44d4693 SHA1 b287a6ca703c0b8065a27743ee9654e7ee339ce8 SHA256 07f28a86cc68cfd3377acbfc76dee9d2e306372d3c56a2154d101b2ae2eab4a1
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFH534rdn07HTTCgIoRAgqzAJ0fcI1GBgdOEnIPBNRdD5ZPCurnBACfQQ/K
+yWHEKLuBTlGw4DSBlI1eyoA=
+=qGaP
+-----END PGP SIGNATURE-----
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"
 }