Temp. fix for >=vdr-1.7.27

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 51 insertions, 5 deletions

diff --git a/media-plugins/vdr-arghdirector/ChangeLog b/media-plugins/vdr-arghdirector/ChangeLog
index 8f55c6b9d103..723727b4ad61 100644
--- a/media-plugins/vdr-arghdirector/ChangeLog
+++ b/media-plugins/vdr-arghdirector/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-arghdirector
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-arghdirector/ChangeLog,v 1.7 2011/01/17 20:53:15 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-arghdirector/ChangeLog,v 1.8 2012/04/25 06:31:04 idl0r Exp $
+
+  25 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
+  vdr-arghdirector-0.2.6.ebuild, +files/vdr-arghdirector-0.2.6-i18n.patch:
+  Temp. fix for >=vdr-1.7.27
 
   17 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-arghdirector-0.2.6.ebuild:
diff --git a/media-plugins/vdr-arghdirector/files/vdr-arghdirector-0.2.6-i18n.patch b/media-plugins/vdr-arghdirector/files/vdr-arghdirector-0.2.6-i18n.patch
new file mode 100644
index 000000000000..621a0469cfa2
--- /dev/null
+++ b/media-plugins/vdr-arghdirector/files/vdr-arghdirector-0.2.6-i18n.patch
@@ -0,0 +1,30 @@
+diff --git a/arghdirector.c b/arghdirector.c
+index f01f11d..56d3fe0 100755
+--- a/arghdirector.c
++++ b/arghdirector.c
+@@ -85,7 +85,9 @@ bool cPluginDirector::ProcessArgs(int argc, char *argv[])
+ bool cPluginDirector::Start(void)
+ {
+   // Start any background activities the plugin shall perform.
++#if VDRVERSNUM < 10727
+   RegisterI18n(Phrases);
++#endif
+ 
+ #if VDRVERSNUM >= 10332
+   if(autoStart == 1)
+diff --git a/i18n.h b/i18n.h
+index 22cce61..1117745 100755
+--- a/i18n.h
++++ b/i18n.h
+@@ -9,8 +9,11 @@
+ #ifndef _I18N__H
+ #define _I18N__H
+ 
++#include <vdr/config.h>
+ #include <vdr/i18n.h>
+ 
++#if VDRVERSNUM < 10727
+ extern const tI18nPhrase Phrases[];
++#endif
+ 
+ #endif //_I18N__H
diff --git a/media-plugins/vdr-arghdirector/vdr-arghdirector-0.2.6.ebuild b/media-plugins/vdr-arghdirector/vdr-arghdirector-0.2.6.ebuild
index aefdc7a27629..034e05937648 100644
--- a/media-plugins/vdr-arghdirector/vdr-arghdirector-0.2.6.ebuild
+++ b/media-plugins/vdr-arghdirector/vdr-arghdirector-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# 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-arghdirector/vdr-arghdirector-0.2.6.ebuild,v 1.7 2011/01/17 20:53:15 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-arghdirector/vdr-arghdirector-0.2.6.ebuild,v 1.8 2012/04/25 06:31:04 idl0r Exp $
 
 EAPI="2"
 
@@ -19,4 +19,16 @@ IUSE=""
 DEPEND=">=media-video/vdr-1.3.34"
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}/${P}-vdr-1.5.3.diff")
+PATCHES=(
+	"${FILESDIR}/${P}-vdr-1.5.3.diff"
+	"${FILESDIR}/${P}-i18n.patch"
+	)
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	# Temp. fix for >= 1.7.27
+	if has_version ">=media-video/vdr-1.7.27"; then
+		sed -i -e 's:i18n.o::' Makefile || die
+	fi
+}