fixed error in diff, reported by S.Grebe on vdr-portal.de; removed useless blocking

Package-Manager: portage-2.1.1-r2

diff --git a/media-plugins/vdr-ffnetdev/ChangeLog b/media-plugins/vdr-ffnetdev/ChangeLog
index f293956f2f4bed936ef40d885ab965578b99e4d2..0f20c1798a4c61ab54980cc56f222c390f981e67 100644 (file)
--- a/media-plugins/vdr-ffnetdev/ChangeLog
+++ b/media-plugins/vdr-ffnetdev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-ffnetdev
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.5 2006/11/17 13:15:46 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.6 2007/01/07 23:40:01 hd_brummy Exp $
+
+  07 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff, vdr-ffnetdev-0.1.0.ebuild:
+  fixed error in diff, reported by S.Grebe on vdr-portal.de; removed useless
+  blocking
 
   17 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   -vdr-ffnetdev-0.0.5.ebuild, vdr-ffnetdev-0.1.0.ebuild:

diff --git a/media-plugins/vdr-ffnetdev/Manifest b/media-plugins/vdr-ffnetdev/Manifest
index 0758761b7d4e9af03bd3475a54a2c5cfa2d613c7..d3cd6cab8859df89c0c1e0b3200fb75392befe8d 100644 (file)
--- a/media-plugins/vdr-ffnetdev/Manifest
+++ b/media-plugins/vdr-ffnetdev/Manifest
@@ -9,19 +9,19 @@ AUX rc-addon.sh 545 RMD160 93b467010f26a9fcca565340b930f3fe37e2587b SHA1 321973d
 MD5 fea860de4df26202a983ae2ecaeadad4 files/rc-addon.sh 545
 RMD160 93b467010f26a9fcca565340b930f3fe37e2587b files/rc-addon.sh 545
 SHA256 28d4d6abe7e3235aba0b7505b050d8b630a39eb39d3d3c1156a856f63aa475b2 files/rc-addon.sh 545
-AUX vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1174 RMD160 92d43970ee24ce645c4f2c8abb19db69a5064688 SHA1 5e4278494a4c6002f4ce645beff3c2b1865e017b SHA256 62edeb498785c3da8416d8eed2727dbdb111fd414399efe87a24168f6a4160a6
-MD5 9745931e3717cc19f99414b2039775dc files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1174
-RMD160 92d43970ee24ce645c4f2c8abb19db69a5064688 files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1174
-SHA256 62edeb498785c3da8416d8eed2727dbdb111fd414399efe87a24168f6a4160a6 files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1174
+AUX vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1161 RMD160 eb4e48ca418bd5e0d94662274af8d11792bf54b3 SHA1 59b171e917a382a065eb593f43572159762cd836 SHA256 e18abc0b7030472a4638f4a708e3b824d771efc05657b03cf2ed7186ea897cf5
+MD5 d5408349f3c251878b5a31d80433d132 files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1161
+RMD160 eb4e48ca418bd5e0d94662274af8d11792bf54b3 files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1161
+SHA256 e18abc0b7030472a4638f4a708e3b824d771efc05657b03cf2ed7186ea897cf5 files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1161
 DIST vdr-ffnetdev-0.1.0.tar.bz2 51213 RMD160 7799671e7f85243abaa898bc0182c85e0befd7bb SHA1 3ae8720d0299433dfec50b1a350c7da11aeef6ab SHA256 7c0cde84118e972256dcf8b6490be6e5739fa3e9ba9374246dd5fad38fef641e
-EBUILD vdr-ffnetdev-0.1.0.ebuild 908 RMD160 b9fe619c7bda1df7bc6c3c4ed974280e691a1183 SHA1 de5a11977270f9537b3823ed6b1af7adde8d465d SHA256 eb3ed136db45ad17ca35fe3c82e2760c1e0d9985fc4817d69576117e67e34a2e
-MD5 0a73a3e9bf3cdb1ee437c9fd98269f30 vdr-ffnetdev-0.1.0.ebuild 908
-RMD160 b9fe619c7bda1df7bc6c3c4ed974280e691a1183 vdr-ffnetdev-0.1.0.ebuild 908
-SHA256 eb3ed136db45ad17ca35fe3c82e2760c1e0d9985fc4817d69576117e67e34a2e vdr-ffnetdev-0.1.0.ebuild 908
-MISC ChangeLog 1082 RMD160 19d33f8695ea51b478fbde7aa1c05b206f8f7b6f SHA1 caa613588864e6681ce7c44d498839005d56712b SHA256 5dca6af3044790641b0319c80f7a90b73dee5b574da7a53af1d90da099b3765c
-MD5 ecdda8a502dca91ca1543d5a51d2375a ChangeLog 1082
-RMD160 19d33f8695ea51b478fbde7aa1c05b206f8f7b6f ChangeLog 1082
-SHA256 5dca6af3044790641b0319c80f7a90b73dee5b574da7a53af1d90da099b3765c ChangeLog 1082
+EBUILD vdr-ffnetdev-0.1.0.ebuild 744 RMD160 549a1f81c2c31b0b585d711aecf6eff86acb3632 SHA1 4ee4983efdd318ddd4fb93c6eee015616e1fb803 SHA256 dabad8d8c69c1afe249b6cbb716e98437833401c509ea59794e4b30d313bb2da
+MD5 6ac9819289841363c1ce422304352795 vdr-ffnetdev-0.1.0.ebuild 744
+RMD160 549a1f81c2c31b0b585d711aecf6eff86acb3632 vdr-ffnetdev-0.1.0.ebuild 744
+SHA256 dabad8d8c69c1afe249b6cbb716e98437833401c509ea59794e4b30d313bb2da vdr-ffnetdev-0.1.0.ebuild 744
+MISC ChangeLog 1308 RMD160 dbd17f0b86b437a224e1082b47a369a37fa2ca29 SHA1 135eb9bdf133e87f486a826355999f678cb963c8 SHA256 9994b1a690d7e70dbc1f17b73b0268925a4b054ba49ddbd4ea7cc39480ffdbd3
+MD5 046b3fb4855f88c0b5ef40c9e31a4253 ChangeLog 1308
+RMD160 dbd17f0b86b437a224e1082b47a369a37fa2ca29 ChangeLog 1308
+SHA256 9994b1a690d7e70dbc1f17b73b0268925a4b054ba49ddbd4ea7cc39480ffdbd3 ChangeLog 1308
 MISC metadata.xml 358 RMD160 c9296bedaad321ec0ee658375280a80a318deec1 SHA1 e0ccc64724869d7a8017c8dba5677ccd5158cfa5 SHA256 facf60cf759199b7dfbfd8e517b644151b95dca7311cb424d142334811bb6c0c
 MD5 5a7fcc0bb81837ae1e1480a7a846a8ba metadata.xml 358
 RMD160 c9296bedaad321ec0ee658375280a80a318deec1 metadata.xml 358
@@ -31,8 +31,9 @@ RMD160 d59904569af24720aa2f9f99b4085e7cab0e442c files/digest-vdr-ffnetdev-0.1.0
 SHA256 e1d320a0a9b290d2fb4aa87c5b00326f47c866cf0685b5d0b601fcecacdadb6b files/digest-vdr-ffnetdev-0.1.0 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: GnuPG-Pack Basics: http://home.arcor.de/rose-indorf
 
-iD8DBQFFXbYqt2vP6XvVdOcRAia0AJ4mCpjGP5uukhLbLTxvDHcge8Q4+QCgn8If
-x/ddaU1s1yAfpPhIA8CwBss=
-=GOby
+iD8DBQFFoYU4dn07HTTCgIoRAnXUAJ9xuUktp8ici5Fgs/5j4cQ0R6np+ACgrDNj
+rkpMx2fmSBgVUDGOLSIWdPE=
+=zj9u
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff
index fd6ccef926c2007950c0c734f2f1a52e2a3e7961..a62d3ee914d980696764a4ebe43086218e0bc013 100644 (file)
--- a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff
+++ b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff
@@ -14,7 +14,7 @@ diff -Naur vdr-ffnetdev-0.1.0.orig/ffnetdev.c vdr-ffnetdev-0.1.0/ffnetdev.c
 +cString cPluginFFNetDev::Active(void) {
 +      if(cOSDWorker::Active() || cTSWorker::Active())
 +              {
-+                      return tr("Null Ahnung");
++                      return NULL;
 +              }
 +      return NULL;
  }

diff --git a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild
index 353c41a5ec1d6eddfc1b1c24be7fa2291f444f05..695c69967768ae207578488b5e5a5956a6380cbe 100644 (file)
--- a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild
+++ b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild,v 1.4 2006/11/17 13:15:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild,v 1.5 2007/01/07 23:40:01 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -13,12 +13,9 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-# this line is necessary as vdr-plugin.eclass changes S
 S=${WORKDIR}/${P}
 
-DEPEND=">=media-video/vdr-1.3.7
-               !media-plugins/vdr-ffnetdev-svn"
-# dont remove last line, it will fix a depend problem on gentoo.de overlay cvs
+DEPEND=">=media-video/vdr-1.3.7"
 
 src_unpack() {
        vdr-plugin_src_unpack