No longer install transponder files/symlink to them into /etc/conf.

(Portage version: 2.1.2.7)

5 files changed, 26 insertions, 7 deletions

diff --git a/media-plugins/vdr-reelchannelscan/ChangeLog b/media-plugins/vdr-reelchannelscan/ChangeLog
index 88b0f604ecbc..9f199593c103 100644
--- a/media-plugins/vdr-reelchannelscan/ChangeLog
+++ b/media-plugins/vdr-reelchannelscan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-reelchannelscan
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/ChangeLog,v 1.9 2007/05/19 14:16:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/ChangeLog,v 1.10 2007/05/21 10:12:42 zzam Exp $
+
+*vdr-reelchannelscan-0.4.3-r1 (21 May 2007)
+
+  21 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/0.4.3/gentoo.diff, +files/0.4.3/series,
+  -vdr-reelchannelscan-0.4.3.ebuild, +vdr-reelchannelscan-0.4.3-r1.ebuild:
+  No longer install transponder files/symlink to them into /etc/conf.
 
 *vdr-reelchannelscan-0.4.3 (19 May 2007)
 
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/gentoo.diff b/media-plugins/vdr-reelchannelscan/files/0.4.3/gentoo.diff
new file mode 100644
index 000000000000..f38657676e37
--- /dev/null
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/gentoo.diff
@@ -0,0 +1,13 @@
+Index: reelchannelscan-0.4.3/transponders.c
+===================================================================
+--- reelchannelscan-0.4.3.orig/transponders.c
++++ reelchannelscan-0.4.3/transponders.c
+@@ -536,7 +536,7 @@ string cTransponders::SetPosition(const 
+ 
+ string cTransponders::TplFileName(int satCodec)
+ {
+-  string tmp = cPlugin::ConfigDirectory();
++  string tmp = "/usr/share/vdr/reelchannelscan";
+   tmp += "/transponders/";
+   if (satCodec == 0)
+   {
diff --git a/media-plugins/vdr-reelchannelscan/files/0.4.3/series b/media-plugins/vdr-reelchannelscan/files/0.4.3/series
new file mode 100644
index 000000000000..0758e7ac501a
--- /dev/null
+++ b/media-plugins/vdr-reelchannelscan/files/0.4.3/series
@@ -0,0 +1 @@
+gentoo.diff
diff --git a/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3 b/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r1
index eef97dc65401..eef97dc65401 100644
--- a/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3
+++ b/media-plugins/vdr-reelchannelscan/files/digest-vdr-reelchannelscan-0.4.3-r1
diff --git a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3.ebuild b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r1.ebuild
index 96661684778b..c0bb31517739 100644
--- a/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3.ebuild
+++ b/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3.ebuild,v 1.1 2007/05/19 14:16:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-reelchannelscan/vdr-reelchannelscan-0.4.3-r1.ebuild,v 1.1 2007/05/21 10:12:42 zzam Exp $
 
 inherit vdr-plugin
 
@@ -21,12 +21,13 @@ pkg_setup(){
 
 	if ! grep -q scanning_on_receiving_device ${ROOT}/usr/include/vdr/device.h; then
 		ewarn "your vdr needs to be patched to use vdr-channelscan"
-#		die "unpatched vdr detected"
+		die "unpatched vdr detected"
 	fi
 }
 
 src_unpack() {
 	vdr-plugin_src_unpack
+	epatch "${FILESDIR}/${PV}/gentoo.diff"
 
 	fix_vdr_libsi_include filter.[ch]
 }
@@ -35,9 +36,6 @@ src_install() {
 	vdr-plugin_src_install
 
 	cd ${S}/transponders
-	insinto /usr/share/vdr/channelscan/transponders
+	insinto /usr/share/vdr/reelchannelscan/transponders
 	doins *.tpl
-
-	insinto /etc/vdr/plugins
-	dosym /usr/share/vdr/channelscan/transponders /etc/vdr/plugins/transponders
 }