6 files changed, 27 insertions, 133 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/Manifest b/media-plugins/vdr-mailbox/Manifest
index 91f023fc938d..00a72d7a1103 100644
--- a/media-plugins/vdr-mailbox/Manifest
+++ b/media-plugins/vdr-mailbox/Manifest
@@ -1,9 +1,15 @@
-AUX vdr-mailbox-0.4.0_vdr-1.5.3.diff 2836 RMD160 e53babab9f200ccdbbc753a7a153275bce8227b5 SHA1 a16c2ff0714e432c7969995ef6e49549792c2cc4 SHA256 9a5901ec204c31dedfbb0e9fed7a8909a8209c0025e5d9bcce151c707362ebfb
-DIST vdr-mailbox-0.4.0.tgz 187385 RMD160 35644c0b2a02665620a469c10171e4470b441e53 SHA1 8c92393e7162bc62d31a1a12f370a0555693054b SHA256 ed3431ee960edd2c66657cfe73f58d394f3930147b03f9b5a10fd2e5f0affd12
-DIST vdr-mailbox-0.5.0.tgz 203890 RMD160 97e10651022ab251ae5e5039f34ce00fa7170a3c SHA1 3b13cf8835f3746cfca7722bade6fc591c344c92 SHA256 7a7bd0da2a78dcec38f564da3984fb9865ac773103bd16fdbf07c500cdb2681b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vdr-mailbox-0.6.0.tgz 176093 RMD160 3be444e5e59dd3f738b87062f19d02477c817915 SHA1 49d2c041f07f54aed87348fae14faea1da6f4c0b SHA256 af0e776cfd967163e09fc442dbf9a2bb3ad26e9f5a5aa95781775920fdbf1a41
-EBUILD vdr-mailbox-0.4.0.ebuild 687 RMD160 ecf709da79259879b452a7811e02abc6b594ddc3 SHA1 9e39a2413d5751091f0916b8019c98d79b8b6501 SHA256 2921efe776e112d07db87874e2db3b30728cfb16506231625a2b089a86f9a9d9
-EBUILD vdr-mailbox-0.5.0.ebuild 692 RMD160 abaaa0c6e0d43e33ee6f51f3e668c35960526039 SHA1 fd71bab8758f4e5ee7b9eb527697b3db041b527b SHA256 fae7db3ca76343c52d16061fc83fb218062b7ddb017c00e8e3bb7e0a2dd64516
-EBUILD vdr-mailbox-0.6.0.ebuild 511 RMD160 12a3add7ec92e114991d86796e90699a07df0eb9 SHA1 a93636527d926c897a867e91561b56a50c38be2a SHA256 fffdd2c878596622ceb70b000ff413dfd672dbe427bfd9daf7dd007fa7cdd0e9
-MISC ChangeLog 967 RMD160 17f0768b7b1dbc4693ed085498b21629d75e948d SHA1 cc270d0eb2b8f14d232214e3798fee43239a75a7 SHA256 8deee1d5ed91537d0fec491cc7f9f30428f0b90f7298a22a1e9142061b2f8af7
+EBUILD vdr-mailbox-0.6.0.ebuild 540 RMD160 dbd734b3c5b30617fabce40bcbece8dd0f16d4dc SHA1 33ab97873f2790c30c91c19e792e0456342b2dcc SHA256 810945c8c7010d6b9f19f3fe594a4e5f2a64771434638496b71eea3754320d61
+MISC ChangeLog 1201 RMD160 80af665c760eb0af35592e21237123c64ffc71a8 SHA1 716c721c647a916447806cb6eb23f9eac87b2b7f SHA256 6a3ef72bf70c26db68d0c0130fe3a35c14a45628b8ba189876834efff7fa251a
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFPMHLTdn07HTTCgIoRAvf3AJ4+++zAJRNPvv0m7K2rzPvArEelQwCeINnl
+os8asqv0W9pVSLR35Zi6jsY=
+=+eHW
+-----END PGP SIGNATURE-----
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}"