Fix default logo path, to match the logos installed by x11-themes/vdr-channel-logos, Bug #257842. Also rdepend on vdr-channel-logos now.

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 59 insertions, 3 deletions

diff --git a/media-plugins/vdr-tvonscreen/ChangeLog b/media-plugins/vdr-tvonscreen/ChangeLog
index bfc238c8c4e3..1eec72710f25 100644
--- a/media-plugins/vdr-tvonscreen/ChangeLog
+++ b/media-plugins/vdr-tvonscreen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-tvonscreen
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/ChangeLog,v 1.7 2008/04/22 10:41:49 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/ChangeLog,v 1.8 2009/02/25 15:52:56 zzam Exp $
+
+*vdr-tvonscreen-1.0.141-r2 (25 Feb 2009)
+
+  25 Feb 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-tvonscreen-1.0.141-logo-path.diff,
+  +vdr-tvonscreen-1.0.141-r2.ebuild:
+  Fix default logo path, to match the logos installed by
+  x11-themes/vdr-channel-logos, Bug #257842. Also rdepend on
+  vdr-channel-logos now.
 
 *vdr-tvonscreen-1.0.141-r1 (22 Apr 2008)
 
diff --git a/media-plugins/vdr-tvonscreen/Manifest b/media-plugins/vdr-tvonscreen/Manifest
index 618625d2902a..e38ac9e35930 100644
--- a/media-plugins/vdr-tvonscreen/Manifest
+++ b/media-plugins/vdr-tvonscreen/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vdr-tvonscreen-0.7.1-includes.diff 364 RMD160 855da04b87d6fd75c00b50a206961df63187bd45 SHA1 8d0f9245768b4378735a116168202185798f0d85 SHA256 d9678372759402b1986e12373aaf6b979efbe9fe3c27f4b82cc05f256df13e45
 AUX vdr-tvonscreen-0.7.1.diff 6109 RMD160 fae9eafbfd84bff00abd707de6d6ee9aa3e9e6e1 SHA1 9aaab0b8881327708597a4c9137826188aab4b6f SHA256 f080f326fb530acbc54d859f4757471c0ed4d43881a8b75ea66c185c774335ce
 AUX vdr-tvonscreen-1.0.141-fixes.diff 4243 RMD160 27773238bba70160ec6334f8c13235577bf41901 SHA1 39d11a4c2f9d2ed4bde08c8982f553022c9c1fb6 SHA256 253a122849defc8b07ea51c1604cc5c06dea0ce0b4052f7d2c68f21795f3a2f3
+AUX vdr-tvonscreen-1.0.141-logo-path.diff 581 RMD160 aa8c4e3e084a853749a6267a1d3f011557d7da04 SHA1 1376ec0a885f7368128b4a141324150f59e4d754 SHA256 73326e4f2a6fdb599047f86d299c37a95ce6c712bcf6069804c5262c0e4b0b23
 AUX vdr-tvonscreen-1.0.141-vdr-1.5.3.diff 5391 RMD160 50ec3fb4ffba2aa0581c41eaacd87ab2bf9008e4 SHA1 20bbd909c86112a87aa049ab1c8e62558eebe6da SHA256 3e73fc290d4d14f1f5f9d7029fc8f3a08b068b47cee4c02e437e9e5d36f4c389
 DIST vdr-tvonscreen-0.7.1.tar.gz 156123 RMD160 1d0d7f6f6f991c68a397a3786de6eaa5ad9f1175 SHA1 f5ddce24864b3ff04fac16d0a662dc7dca860668 SHA256 72535eebdcced6d6c005b7fa90bc622e44618067219da74fee4cf5ddd95e00ce
 DIST vdr-tvonscreen-1.0.141.tar.gz 153054 RMD160 d77f943973504c031776b9d706daf7bb88bf8bac SHA1 b55d7672dc8f36f655f4ea185cd99bb87c19fc2b SHA256 58d553b831c381b67ddb85d786a828ed23008293e69c35c329208ba70ad3e543
 EBUILD vdr-tvonscreen-0.7.1.ebuild 578 RMD160 73879333e66950e25b8adc4b7b72d731183ed437 SHA1 eb12e4b56a2a57edf13a7e9bd39116aabb236f3c SHA256 668832f3cef6af8cf2351f4581737e22c9bd1365a812e381f8c8ac01bad637f9
 EBUILD vdr-tvonscreen-1.0.141-r1.ebuild 612 RMD160 1b49614efbef459e58e7cd8b153f1e26f7fee13d SHA1 e63f82d57483293dd0ac2e53316a8aa3eaaa761e SHA256 ab26874b9822ce4c3ca26f577399ae71ee7a2ec82772867f7a35b37eab0e1aac
+EBUILD vdr-tvonscreen-1.0.141-r2.ebuild 692 RMD160 82a23fdbb7ab6e9624138ab9f54e0a74a79ae27b SHA1 779e8c22d750a2efbbc1ae8b70458b48f554936b SHA256 c08b0fa2ab6a5d5717ee65840c7b35a7618709fb08f081e8fe571e2cf217c8fd
 EBUILD vdr-tvonscreen-1.0.141.ebuild 513 RMD160 e09ee0af5ecb0fd83e046391980f8deb7a8f25bb SHA1 aae691e83587140f64cb16965085570b46d78721 SHA256 c88ae4a2349746bcc5dc893358ce21fe5f59d1e57e4179d8929853deba3b3bbd
-MISC ChangeLog 1493 RMD160 3fda3c8bf81049093848513807550f22269df279 SHA1 b346b115fe1bbc060264133bec3ec56e95cc686c SHA256 f8bb04e82c3cfeab6592d45e98f9ee3cf5230af650338291bca62c62fdefd110
+MISC ChangeLog 1817 RMD160 60401220c250f88c5f940f690897950601ed9a1a SHA1 e676e68790504970eb4301d9ef7c0f2f448013fa SHA256 1484736734ec827f02a03a6581ab33250d470109e26bf5f232e99d91b70fee27
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmlaV4ACgkQt2vP6XvVdOfEMwCgvgaP3p3xJaQvzrtk3F2gvxr9
+9pQAnj3gpQ+TCIFppjfDf17WIY8eV+Zf
+=Lwxs
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff
new file mode 100644
index 000000000000..41125073f2be
--- /dev/null
+++ b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff
@@ -0,0 +1,12 @@
+diff -ru tvonscreen-1.0.141.orig/magazine.c tvonscreen-1.0.141/magazine.c
+--- tvonscreen-1.0.141.orig/magazine.c	2009-02-25 16:39:18.024158328 +0100
++++ tvonscreen-1.0.141/magazine.c	2009-02-25 16:39:51.401402805 +0100
+@@ -183,7 +183,7 @@
+ 		txt=channel->ShortName(true);
+ 		// logo: 64x48px
+ 
+-		const char *ConfigDirectory=cPlugin::ConfigDirectory("logos");
++		const char *ConfigDirectory="/usr/share/vdr/channel-logos";
+ 		if (tvonscreenCfg.logos)
+ 			ConfigDirectory=tvonscreenCfg.logos;
+ 		char *fname=new char[strlen(ConfigDirectory) + 1 + strlen(txt) + strlen(".xpm") + 1];
diff --git a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild b/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild
new file mode 100644
index 000000000000..1b34b9c7d85e
--- /dev/null
+++ b/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild,v 1.1 2009/02/25 15:52:56 zzam Exp $
+
+IUSE=""
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: Show EPG like a TV guide"
+HOMEPAGE="http://www.js-home.org/vdr/tvonscreen"
+SRC_URI="http://www.js-home.org/vdr/tvonscreen/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=media-video/vdr-1.4.1"
+RDEPEND="${DEPEND}
+	x11-themes/vdr-channel-logos"
+
+PATCHES=("${FILESDIR}/${P}-fixes.diff"
+	"${FILESDIR}/${P}-vdr-1.5.3.diff"
+	"${FILESDIR}/${P}-logo-path.diff")
+
+NO_GETTEXT_HACK=1