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

(Portage version: 2.1.10.11/cvs/Linux i686)

11 files changed, 16 insertions, 245 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/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