cleanup, eapi=3, stable x86 amd64, bug 397083

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

12 files changed, 24 insertions, 264 deletions

diff --git a/media-plugins/vdr-rssreader/ChangeLog b/media-plugins/vdr-rssreader/ChangeLog
index 8649f275596f..9bfbe4dc2fa5 100644
--- a/media-plugins/vdr-rssreader/ChangeLog
+++ b/media-plugins/vdr-rssreader/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-rssreader
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.9 2011/07/25 10:45:47 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/ChangeLog,v 1.10 2012/02/07 00:26:02 hd_brummy Exp $
+
+  07 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-rssreader-1.0.3.ebuild, -files/vdr-rssreader-1.0.3-gentoo.diff,
+  -files/vdr-rssreader-1.0.3-gentoo-rss.diff, -vdr-rssreader-1.1.4.ebuild,
+  -files/vdr-rssreader-1.1.4-gentoo.diff,
+  -files/vdr-rssreader-1.1.4-gentoo-rss.diff, -vdr-rssreader-1.6.0.ebuild,
+  -files/vdr-rssreader-1.6.0-gentoo.diff,
+  -files/vdr-rssreader-1.6.0-gentoo-rss.diff, vdr-rssreader-1.6.4.ebuild:
+  cleanup, eapi=3, stable x86 amd64, bug 397083
 
   25 Jul 2011; Christoph Mende <angelos@gentoo.org> vdr-rssreader-1.0.3.ebuild,
   vdr-rssreader-1.1.4.ebuild, vdr-rssreader-1.6.0.ebuild,
diff --git a/media-plugins/vdr-rssreader/Manifest b/media-plugins/vdr-rssreader/Manifest
index 7a6ec2bb8452..92ba1c3380c6 100644
--- a/media-plugins/vdr-rssreader/Manifest
+++ b/media-plugins/vdr-rssreader/Manifest
@@ -1,28 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
-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
-AUX vdr-rssreader-1.6.0-gentoo-rss.diff 1065 RMD160 290d57222cd1be85d97357f127d5315bd49052ca SHA1 409039d8691c787e5b05d0bdfeb689bc9f0016d2 SHA256 6ac687fb3ec7b53600253a2a576f0995e35f227ccb7d553035f9a9d10dcfe731
-AUX vdr-rssreader-1.6.0-gentoo.diff 1504 RMD160 2f282877677c1ea849ce8969014022d68347b7d6 SHA1 2a3a585c361875880f24eb7440c172b37d9003ce SHA256 374d441ae2c6afd01eb607c3c1c31ca422d72827d7628cd917d79488636c15b7
 AUX vdr-rssreader-1.6.4-curl-headers.patch 248 RMD160 f4d11d5e01e3e33d3f2db47823882942e7cf0680 SHA1 642c477609f3fdca3e2d131ab1f5b64677dcb119 SHA256 932001f64a6a7fe32188303cf26aa6843a0b4a68a07181ca32ce4132852b8604
 AUX vdr-rssreader-1.6.4-gentoo-rss.diff 722 RMD160 de594bec4e55dbb52115a41781b5c61d1e304bfa SHA1 d13e9bd38db4e7e4a1993c8e32ad0d2e07585498 SHA256 1b906a6aff35460a1cb72a23d5fce9b9b84f42035abdaabbb19701774b51b80f
-DIST vdr-rssreader-1.0.3.tgz 20502 RMD160 7f0c2ae2a0ebc21ff18de23c5a5299e5ec766514 SHA1 d8d312e97496b1f73a1a5302394122676b3a591d SHA256 25fe55592163ae5b0eb01eadd9027c8e641368cf3fb29750843b3dfb80b9879e
-DIST vdr-rssreader-1.1.4.tgz 21412 RMD160 de39c64733043f2a1190fca182e80d45a1e664f5 SHA1 4bd86e96d08685092eb98982aea5467124cbdef4 SHA256 b9f46ec6e8620e36b9d51a662b3f49b66b8bb1e9e4001b1287a009d06d2b5ade
-DIST vdr-rssreader-1.6.0.tgz 21679 RMD160 a1046c8a97281926d912adc7f6c45c05492e3c08 SHA1 6d62ab1ab529daa06b7c3456668034fe63335e5f SHA256 5ac71d3b5f43faa00fafa0df65ad69d1956693d7a72f8e8c1f821a208c85f09d
 DIST vdr-rssreader-1.6.4.tgz 23533 RMD160 0a8f9d2698f156e7c211dd4023d3a0992d6d71d3 SHA1 6f1feebe7b15120e0449cd7736ff79dcbd5bf63d SHA256 2a3516c82367ad77a66cf95baf758191b82cbd0a4d26cfb1ab733c0d88bc5af6
-EBUILD vdr-rssreader-1.0.3.ebuild 845 RMD160 26fb5800ebd71f5d7390b93a3c8ce16f4951089e SHA1 4f3c3dce7bc5a763557fbc832a8fc844581f2018 SHA256 4f6d37cdeb2b9f4f5edd96cdc5d5972937808356189a4895fe0fa04b5bea17a2
-EBUILD vdr-rssreader-1.1.4.ebuild 843 RMD160 ff52af2e414a9b1ff5517070dc768a8c4f4970ab SHA1 8e37de4f03ff54b30f91617539ec5ae1366b66cf SHA256 6ed54211265ea6783d07f34c19e00580a767252519febb9f67ba5da7c9fcd1ab
-EBUILD vdr-rssreader-1.6.0.ebuild 842 RMD160 88b4a3fce783e29201d80253f893367c7f40f44b SHA1 1491360b0083f082271611021e8b51eee4f7e122 SHA256 8bdda93c8474f8ebdd916f29e68980c01890be18e4a7bfa612b1a5d6b9596e49
-EBUILD vdr-rssreader-1.6.4.ebuild 827 RMD160 88a5ab8f477aa8ed20cdedf63f3b25bbbdb5dfab SHA1 8b756caa4d7f962284f630043e4f743f956bcb08 SHA256 919a4bdcf7e9830df5b86e153254b660873063c61ae768cc446751c2f20f5a98
-MISC ChangeLog 2420 RMD160 b11aa28282a8f7247d2d0a03a0bc4902650679dd SHA1 e2878e9b146fada495028972f5cbfff326bf5e72 SHA256 1364c3e5ef8b21e18249d9ecf6583e8d9dd45ca865f4afe46ec06ea62119310a
+EBUILD vdr-rssreader-1.6.4.ebuild 817 RMD160 11dc31487c08bd4fedc7bbc5d6390121105705bb SHA1 0af30ff0304f711864618457040742050582b423 SHA256 9bf1c1ddc7829d3d158d64c97173cc4a8b17e3651a4100b969ae8e4acd1c591e
+MISC ChangeLog 2906 RMD160 15683f5fdad830409c3be94061e8fe7951997e88 SHA1 5fbb0c772150c9cf82ed068025183e16349821e4 SHA256 22c04256824a2f799d3e29dba357d58348b0bf4dfa94f68527a810bcdc085322
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iF4EAREIAAYFAk4tSVUACgkQmWq1bYTyC0P7swD/QsdZ2nmNygU+pLcwXEkK+bSn
-dJ73OQ4dBXI8umCjaeEA/RaglzBez0nVM+mtModIYAqrjsCT1qRkj0xQntd3Pef8
-=v4PG
+iD8DBQFPMG+kdn07HTTCgIoRAr4dAJ97b3w18nAcGPbXBszRJrdAa35JxQCfUXUK
+yhjTO4NXEe0KlakWYE1FQSU=
+=91Cj
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.3-gentoo-rss.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.3-gentoo-rss.diff
deleted file mode 100644
index 7fcca1fa70af..000000000000
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.3-gentoo-rss.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: rssreader-1.0.3/example/rssreader.conf
-===================================================================
---- rssreader-1.0.3.orig/example/rssreader.conf
-+++ rssreader-1.0.3/example/rssreader.conf
-@@ -1,6 +1,11 @@
- # 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
- -- VDR                 : # Label
- VDR Announcements      : http://www.linuxtv.fi/extras/vdr_announce_rss.php?num=10
- Linuxtv.fi foorumi     : http://www.linuxtv.fi/rss.php
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.3-gentoo.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.3-gentoo.diff
deleted file mode 100644
index 7dda6d8d54ba..000000000000
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.0.3-gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: rssreader-1.0.3/example/rssreader.conf
-===================================================================
---- rssreader-1.0.3.orig/example/rssreader.conf
-+++ rssreader-1.0.3/example/rssreader.conf
-@@ -5,6 +5,7 @@
- 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
- Naula                  : http://kapsi.fi/~juhtolv/diary/nb/archives/cat_2/index-rss.xml
- Lehti                  : http://lehti.samizdat.info/feed/rss2/
-Index: rssreader-1.0.3/rssreader.c
-===================================================================
---- rssreader-1.0.3.orig/rssreader.c
-+++ rssreader-1.0.3/rssreader.c
-@@ -92,7 +92,7 @@ bool cPluginRssReader::Initialize(void)
- bool cPluginRssReader::Start(void)
- {
-   // Start any background activities the plugin shall perform.
--  if (!RssItems.Load(AddDirectory(ConfigDirectory(), "rssreader.conf")))
-+  if (!RssItems.Load(AddDirectory(ConfigDirectory("rssreader"), "rssreader.conf")))
-      error("configuration file 'rssreader.conf' not found!");
-   return true;
- }
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo-rss.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo-rss.diff
deleted file mode 100644
index 1b9d3c6ebb63..000000000000
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo-rss.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-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,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                 : http://www.gentoo.org/rdf/en/gentoo-news.rdf
- -- VDR                 : # Label
- 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                 : http://www.gentoo.org/rdf/en/gentoo-news.rdf
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo.diff
deleted file mode 100644
index 051baa035ade..000000000000
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.1.4-gentoo.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rc rssreader-1.0.1.orig/example/rssreader.conf rssreader-1.0.1.mod/example/rssreader.conf
-*** 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
-***************
-*** 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/
-  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
-***************
-*** 90,96 ****
-  bool cPluginRssReader::Start(void)
-  {
-    // Start any background activities the plugin shall perform.
-!   if (!RssItems.Load(AddDirectory(ConfigDirectory(), "rssreader.conf")))
-       error("configuration file 'rssreader.conf' not found!");
-    return true;
-  }
---- 90,96 ----
-  bool cPluginRssReader::Start(void)
-  {
-    // Start any background activities the plugin shall perform.
-!   if (!RssItems.Load(AddDirectory(ConfigDirectory(), "rssreader/rssreader.conf")))
-       error("configuration file 'rssreader.conf' not found!");
-    return true;
-  }
-
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.0-gentoo-rss.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.0-gentoo-rss.diff
deleted file mode 100644
index 1b9d3c6ebb63..000000000000
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.0-gentoo-rss.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-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,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                 : http://www.gentoo.org/rdf/en/gentoo-news.rdf
- -- VDR                 : # Label
- 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                 : http://www.gentoo.org/rdf/en/gentoo-news.rdf
diff --git a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.0-gentoo.diff b/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.0-gentoo.diff
deleted file mode 100644
index 051baa035ade..000000000000
--- a/media-plugins/vdr-rssreader/files/vdr-rssreader-1.6.0-gentoo.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -rc rssreader-1.0.1.orig/example/rssreader.conf rssreader-1.0.1.mod/example/rssreader.conf
-*** 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
-***************
-*** 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/
-  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
-***************
-*** 90,96 ****
-  bool cPluginRssReader::Start(void)
-  {
-    // Start any background activities the plugin shall perform.
-!   if (!RssItems.Load(AddDirectory(ConfigDirectory(), "rssreader.conf")))
-       error("configuration file 'rssreader.conf' not found!");
-    return true;
-  }
---- 90,96 ----
-  bool cPluginRssReader::Start(void)
-  {
-    // Start any background activities the plugin shall perform.
-!   if (!RssItems.Load(AddDirectory(ConfigDirectory(), "rssreader/rssreader.conf")))
-       error("configuration file 'rssreader.conf' not found!");
-    return true;
-  }
-
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild
deleted file mode 100644
index dd6b30e0be03..000000000000
--- a/media-plugins/vdr-rssreader/vdr-rssreader-1.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 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.4 2011/07/25 10:45:47 angelos Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder RSS reader Plugin"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.38
-		>=dev-libs/expat-1.95.8
-		>=net-misc/curl-7.15.1-r1"
-
-RDEPEND=""
-
-PATCHES=("${FILESDIR}/${P}-gentoo.diff"
-	"${FILESDIR}/${PN}-1.6.4-curl-headers.patch"
-	"${FILESDIR}/${P}-gentoo-rss.diff")
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/rssreader
-	doins   "${S}"/example/rssreader.conf
-}
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild
deleted file mode 100644
index d849944d8a9c..000000000000
--- a/media-plugins/vdr-rssreader/vdr-rssreader-1.1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 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.1.4.ebuild,v 1.3 2011/07/25 10:45:47 angelos Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder RSS reader Plugin"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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}/${PN}-1.6.4-curl-headers.patch"
-	"${FILESDIR}/${P}-gentoo-rss.diff")
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/rssreader
-	doins "${S}/example/rssreader.conf"
-}
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.0.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.6.0.ebuild
deleted file mode 100644
index e02a7e0085bc..000000000000
--- a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 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.6.0.ebuild,v 1.4 2011/07/25 10:45:47 angelos Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder RSS reader Plugin"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0
-		>=dev-libs/expat-1.95.8
-		>=net-misc/curl-7.15.1-r1"
-
-RDEPEND=""
-
-PATCHES=("${FILESDIR}/${P}-gentoo.diff"
-	"${FILESDIR}/${PN}-1.6.4-curl-headers.patch"
-	"${FILESDIR}/${P}-gentoo-rss.diff")
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/plugins/rssreader
-	doins "${S}/example/rssreader.conf"
-}
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild
index 4bdb0a401247..12d2f879621a 100644
--- a/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild
+++ b/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.6.4.ebuild,v 1.2 2011/07/25 10:45:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-1.6.4.ebuild,v 1.3 2012/02/07 00:26:02 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit vdr-plugin
 
-DESCRIPTION="Video Disk Recorder RSS reader Plugin"
+DESCRIPTION="VDR Plugin: RSS feed reader"
 HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/"
 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.6.0