Temp. fix for >=vdr-1.7.27

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 63 insertions, 13 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/Manifest b/media-plugins/vdr-arghdirector/Manifest
index 1ab0aba9057f..f2448ef9601e 100644
--- a/media-plugins/vdr-arghdirector/Manifest
+++ b/media-plugins/vdr-arghdirector/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX vdr-arghdirector-0.2.6-i18n.patch 682 RMD160 74d5765023c1bd70b1b24af9dbd8e24668cf555a SHA1 3d17dd0a7ee7c989f640418a28660f4e229301c1 SHA256 ccb8d90c9c02d0bba69fb6116a5c042027038456cd8e87ddce3f321bb2e45dd3
 AUX vdr-arghdirector-0.2.6-vdr-1.5.3.diff 519 RMD160 5203d3f4f21e3dc4ce34ba163fe7d8a6b3b853d6 SHA1 1095a83f10a8c6631339d659289aebb17ca208ca SHA256 1830f42c011b122a1eb84edf7cded6d37687015fd68be5f6fef8290b8b734ca5
 DIST vdr-arghdirector-0.2.6.tar.gz 22119 RMD160 69f8c726b63786606ea53957a7d3b4dfe3006fb1 SHA1 9030fda40f66b64188374df1a5de7d3d53c4fc46 SHA256 d7206796560b4fdc7693f338ba4f1a8f4d416ae64fd60da195e4319527026b60
-EBUILD vdr-arghdirector-0.2.6.ebuild 681 RMD160 b17384de1d343f350812511e30d0b8bb270566fe SHA1 71e2a59b03f715c9466fe7a225b7451c09d4e265 SHA256 72b8c4c613d4dd954338d5940f5102f0ae8c1dbf622f0f0c64204ae1b0c4cd5c
-MISC ChangeLog 1118 RMD160 e2ca0c6de85f9a687ed333a31f5612490d3eb6e3 SHA1 bb0a9a0e7149f76ba143da2d24f79618152168df SHA256 973bfa356b007d48ab67843a84f522ef588f4ba5076c13266a483b3b12d6241f
+EBUILD vdr-arghdirector-0.2.6.ebuild 877 RMD160 995cc2b97499a92b5c898ddf8b9edc0377571a7c SHA1 c2dd041f0f4d4cab2aba77490fb3a50a18480152 SHA256 65da8ddbaddfbc60fd5b3926d767436acf05e522d6b724c7d355b8759ec57427
+MISC ChangeLog 1271 RMD160 ad0af5febd6ce3b5c5b1fc0c191e44901ea28dc3 SHA1 f3843aa646267d93ef6965f5cfa2f18a0fa9733c SHA256 2c338c6db799c057f8a4950cca79159a6d53a0e274189ca559c9a1cac8985378
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFNNKxPdn07HTTCgIoRAr7zAJ9UsusiKtgPk0KZNuUWAHWp3Cx/LwCfRfZf
-K+r8xxnooCYbS9FWy0ktGdI=
-=2P1g
+iQEcBAEBCAAGBQJPl5owAAoJEMOx0zmdw4Z11zYIAJDsJ5peCNaYfhZnWu/xEgow
+Ihhlv5HGzshAz8CccXHD/zbs0QwxA6E+ZX1PRlopdD7QREtI7yCxlflmdG6QNDXz
+IOzXDmDRHx7is7FfIJ2k5QDASSMMlawQFRRbjqIhPK3JkyG9MtBQ4AuBpN8ud9XR
+PNIqB9hDwfn/a6bpSF319dCgbB69mVISFpYy8h1ylzUsHZC0OnN8PH+mTffH1iw8
+NxDd6E73hVsk3ey1+IACdocIfXrG4szPYEofJKbNZXzxSyqLh+2K3FyON/9TAmTK
+223qja843dmQs9U/4Z/tJcqIMUygcseAdw0g4B431gc9ZzxHYm7SgJjI15YP8oo=
+=AMIK
 -----END PGP SIGNATURE-----
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
+}