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

(Portage version: 2.1.10.11/cvs/Linux i686)

5 files changed, 14 insertions, 126 deletions

diff --git a/media-plugins/vdr-mailbox/ChangeLog b/media-plugins/vdr-mailbox/ChangeLog
index 0ed617a6bbb1..5c7d96315fa7 100644
--- a/media-plugins/vdr-mailbox/ChangeLog
+++ b/media-plugins/vdr-mailbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-mailbox
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mailbox/ChangeLog,v 1.4 2008/08/16 07:55:39 zzam Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mailbox/ChangeLog,v 1.5 2012/02/07 00:39:38 hd_brummy Exp $
+
+  07 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-mailbox-0.4.0.ebuild, -files/vdr-mailbox-0.4.0_vdr-1.5.3.diff,
+  -vdr-mailbox-0.5.0.ebuild, vdr-mailbox-0.6.0.ebuild:
+  cleanup, eapi=3, stable x86 amd64, bug 397081
 
 *vdr-mailbox-0.6.0 (16 Aug 2008)
 
diff --git a/media-plugins/vdr-mailbox/files/vdr-mailbox-0.4.0_vdr-1.5.3.diff b/media-plugins/vdr-mailbox/files/vdr-mailbox-0.4.0_vdr-1.5.3.diff
deleted file mode 100644
index e7a7e05b7327..000000000000
--- a/media-plugins/vdr-mailbox/files/vdr-mailbox-0.4.0_vdr-1.5.3.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-http://toms-cafe.de/vdr/download/mailbox-0.4.0-1.5.3.diff
-
---- mailbox-0.4.0/AxMailWrapper.cpp
-+++ mailbox-0.4.0/AxMailWrapper.cpp
-@@ -578,7 +578,11 @@ AxMailWrapper::LineCltn AxMailWrapper::g
- 
-       //----- convert to OSD-CharSet -----
-       Ax::Mail::Tools::map2CharSet( aStr, thePart->getParam("charset")
-+#if APIVERSNUM >= 10503
-+                                  , aStr, cCharSetConv::SystemCharacterTable()
-+#else
-                                   , aStr, I18nCharSets()[Setup.OSDLanguage]
-+#endif
-                                   );
- 
-       //----- do formatting---------------
---- mailbox-0.4.0/AxMenuMailListView.cpp
-+++ mailbox-0.4.0/AxMenuMailListView.cpp
-@@ -149,7 +149,11 @@ void AxMailItem::createCacheValues()
- {
-   if (mySubject.empty())
-   {
-+#if APIVERSNUM >= 10503
-+    if (!Ax::Mail::Tools::decodeEncodedWords(myMail->getSubject(), mySubject, cCharSetConv::SystemCharacterTable(), true))
-+#else
-     if (!Ax::Mail::Tools::decodeEncodedWords(myMail->getSubject(), mySubject, I18nCharSets()[Setup.OSDLanguage], true))
-+#endif
-     {
-       wswarn(("AxMailItem::AxMailItem() unable to decode subject line '%s'", mySubject.c_str()));
-     } // if
-@@ -157,7 +161,11 @@ void AxMailItem::createCacheValues()
- 
-   if (myFrom.empty())
-   {
-+#if APIVERSNUM >= 10503
-+    if (!Ax::Mail::Tools::decodeEncodedWords(myMail->getFrom(), myFrom, cCharSetConv::SystemCharacterTable(), true))
-+#else
-     if (!Ax::Mail::Tools::decodeEncodedWords(myMail->getFrom(), myFrom, I18nCharSets()[Setup.OSDLanguage], true))
-+#endif
-     {
-       wswarn(("AxMailItem::AxMailItem() unable to decode from line '%s'", myFrom.c_str()));
-     } // if
---- mailbox-0.4.0/AxMenuMailView.cpp
-+++ mailbox-0.4.0/AxMenuMailView.cpp
-@@ -325,14 +325,22 @@ void AxMenuMailView::updateWithCurrentMa
-     std::string aText;
- 
-     //----- Subject: --------------------------------------------------------
-+#if APIVERSNUM >= 10503
-+    if (!Ax::Mail::Tools::decodeEncodedWords(aMail->getSubject(), aText, cCharSetConv::SystemCharacterTable(), true))
-+#else
-     if (!Ax::Mail::Tools::decodeEncodedWords(aMail->getSubject(), aText, I18nCharSets()[Setup.OSDLanguage], true))
-+#endif
-     {
-       wswarn(("AxMenuMailView::updateWithCurrentMail() unable to decode subject line '%s'", aText.c_str()));
-     } // if
-     myBodyText += string(tr("Subject")) + ":\t " + aText + "\n";
- 
-     //----- From: ------------------------------------------------------------
-+#if APIVERSNUM >= 10503
-+    if (!Ax::Mail::Tools::decodeEncodedWords(aMail->getFrom(), aText, cCharSetConv::SystemCharacterTable(), true))
-+#else
-     if (!Ax::Mail::Tools::decodeEncodedWords(aMail->getFrom(), aText, I18nCharSets()[Setup.OSDLanguage], true))
-+#endif
-     {
-       wswarn(("AxMenuMailView::updateWithCurrentMail() unable to decode from line '%s'", aText.c_str()));
-     } // if
-
diff --git a/media-plugins/vdr-mailbox/vdr-mailbox-0.4.0.ebuild b/media-plugins/vdr-mailbox/vdr-mailbox-0.4.0.ebuild
deleted file mode 100644
index 4f842432eac4..000000000000
--- a/media-plugins/vdr-mailbox/vdr-mailbox-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +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-mailbox/vdr-mailbox-0.4.0.ebuild,v 1.3 2007/10/22 12:30:58 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: MailBox"
-HOMEPAGE="http://sites.inka.de/seca/vdr"
-SRC_URI="http://sites.inka.de/seca/vdr/download/${P}.tgz
-		mirror://vdrfiles/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.8
-		>=net-libs/c-client-2002e-r1"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}_vdr-1.5.3.diff"
-
-	sed -i Makefile -e "s:^#CXXFLAGS +=:CXXFLAGS +=:"
-}
diff --git a/media-plugins/vdr-mailbox/vdr-mailbox-0.5.0.ebuild b/media-plugins/vdr-mailbox/vdr-mailbox-0.5.0.ebuild
deleted file mode 100644
index 5045fcbbfe43..000000000000
--- a/media-plugins/vdr-mailbox/vdr-mailbox-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +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-mailbox/vdr-mailbox-0.5.0.ebuild,v 1.2 2007/10/22 12:30:58 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: MailBox"
-HOMEPAGE="http://sites.inka.de/seca/vdr"
-SRC_URI="http://sites.inka.de/seca/vdr/download/${P}.tgz
-		mirror://vdrfiles/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.8
-		>=net-libs/c-client-2002e-r1"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-	cd "${S}"
-
-	# enable additional flags needed for c-client
-	sed -i Makefile -e "s:^#CXXFLAGS +=:CXXFLAGS +=:"
-}
diff --git a/media-plugins/vdr-mailbox/vdr-mailbox-0.6.0.ebuild b/media-plugins/vdr-mailbox/vdr-mailbox-0.6.0.ebuild
index 350e23e44f27..653902606fca 100644
--- a/media-plugins/vdr-mailbox/vdr-mailbox-0.6.0.ebuild
+++ b/media-plugins/vdr-mailbox/vdr-mailbox-0.6.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 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-mailbox/vdr-mailbox-0.6.0.ebuild,v 1.2 2008/08/16 18:43:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mailbox/vdr-mailbox-0.6.0.ebuild,v 1.3 2012/02/07 00:39:38 hd_brummy Exp $
+
+EAPI="3"
 
 inherit vdr-plugin
 
@@ -10,8 +12,10 @@ SRC_URI="http://alex.vdr-developer.org/download/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.8
 		>=net-libs/c-client-2002e-r1"
+
+RDEPEND="${DEPEND}"