removed unneeded blacklist source

(Portage version: 2.1.7.16/cvs/Linux i686)

4 files changed, 10 insertions, 32 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 175dc1016be8..cda1cddd51ec 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.39 2010/03/21 16:42:30 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.40 2010/03/21 21:18:50 hd_brummy Exp $
+
+*noad-0.7.1-r1 (21 Mar 2010)
+
+  21 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/0.7.1/noad-blacklist, -noad-0.7.1.ebuild, +noad-0.7.1-r1.ebuild,
+  files/0.7.1/record-50-noad.sh:
+  removed unneeded blacklist source
 
 *noad-0.7.1 (21 Mar 2010)
 
diff --git a/media-video/noad/files/0.7.1/noad-blacklist b/media-video/noad/files/0.7.1/noad-blacklist
deleted file mode 100644
index c91a6fa3bd5a..000000000000
--- a/media-video/noad/files/0.7.1/noad-blacklist
+++ /dev/null
@@ -1,7 +0,0 @@
-# Put in some channels (syntax like channels.conf) in noad-blacklist file to disable the automatic NOAD-scan
-# Nevertheless, you can scan the vdr-files with the noad-command from OSD
-#
-# Das Erste;ARD:11836:hC34:S19.2E:27500:101:102=deu,103=2ch;106=dd:104:0:28106:1:1101:0
-#
-
-
diff --git a/media-video/noad/files/0.7.1/record-50-noad.sh b/media-video/noad/files/0.7.1/record-50-noad.sh
index bd20ba35753c..57f32a53e8ed 100644
--- a/media-video/noad/files/0.7.1/record-50-noad.sh
+++ b/media-video/noad/files/0.7.1/record-50-noad.sh
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.7.1/record-50-noad.sh,v 1.1 2010/03/21 16:42:27 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.7.1/record-50-noad.sh,v 1.2 2010/03/21 21:18:52 hd_brummy Exp $
 #
 # Joerg Bornkessel <hd_brummy@gentoo.org>
 # Mathias Schwarzott <zzam@gentoo.org>
@@ -12,22 +12,6 @@ CMD="/usr/bin/noad"
 # parameter are "no | yes"
 
 FORCE_OFFLINE_SCAN=no
-NOAD_CHANNEL_FILE="/etc/vdr/noad-blacklist"
-
-
-if [ "${VDR_RECORD_STATE}" = "after" ]; then
-unset -v NOAD_CHANNEL_ID
-VDR_RECORD_CHANNEL_ID=$(awk '($1 == "C") { print $2 }' "${VDR_RECORD_NAME}/info.vdr")
-
-        if [ -f "${NOAD_CHANNEL_FILE}" ]; then
-                awk -F: '{ printf "%s-%s-%s-%s\n",$4, $11, $12, $10; }' "${NOAD_CHANNEL_FILE}" | grep "${VDR_RECORD_CHANNEL_ID}"
-                if [ $? = 0 ]; then
-			mesg "NOAD-Scan aborted by /etc/vdr/noad-blacklist"
-                        exit
-                fi
-        fi
-fi
-
 
 if [ "${VDR_RECORD_STATE}" = "reccmd" ]; then
 	# script started from reccmd
diff --git a/media-video/noad/noad-0.7.1.ebuild b/media-video/noad/noad-0.7.1-r1.ebuild
index 4255742fdc8e..7bcecdf07e00 100644
--- a/media-video/noad/noad-0.7.1.ebuild
+++ b/media-video/noad/noad-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.1.ebuild,v 1.1 2010/03/21 16:42:30 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.1-r1.ebuild,v 1.1 2010/03/21 21:18:50 hd_brummy Exp $
 
 EAPI="2"
 
@@ -60,9 +60,6 @@ src_install() {
 	insinto /etc/vdr/reccmds
 	doins "${CONF_SOURCE}"/reccmds.noad.conf
 
-	insinto /etc/vdr/
-	doins "${CONF_SOURCE}"/noad-blacklist
-
 	exeinto /usr/share/vdr/bin
 	doexe "${CONF_SOURCE}"/noad-reccmd
 }
@@ -77,7 +74,4 @@ pkg_postinst() {
 	elog
 	elog "Note: You can use here all pararmeters for noad,"
 	elog "please look in the documentation of noad."
-	elog
-	elog "up from this version, noad works with .ts file structur"
-	elog "used in comming up version >=vdr-1.7.4"
 }