removed unneeded blacklist source

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

5 files changed, 16 insertions, 39 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/Manifest b/media-video/noad/Manifest
index ebee69f71a9d..2ddda1596025 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -6,10 +6,9 @@ AUX 0.6.0-r7/noad-reccmd 145 RMD160 928c85fbd77afa5239ae3c7ef3923e2cfd0f61af SHA
 AUX 0.6.0-r7/reccmds.noad.conf 61 RMD160 c62bdb45da8ae9aabfbd7a688f4600a5af04397f SHA1 d5fe02b78a5abd932fe0d6a5769bc8aa2e3ca54c SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d
 AUX 0.6.0-r7/record-50-noad.sh 1565 RMD160 636d255d5fa2fa76ff054fe53f8a7d7ae062ccc5 SHA1 091770c66d77de3d49ffc2e9faf2b8e842069c11 SHA256 d46b7763cb89ab1ebea889c1bcfa9f1362b376256901397e6c6dc61b73095a1f
 AUX 0.7.1/confd_vdraddon.noad 1445 RMD160 d3ec1ffc0b5458e5f7bce3bc0fdf2d1aee527ee1 SHA1 79b76dbb7a59d1cd3f1b89996df1bd97cbd2ea5f SHA256 63d888c8d3c1a5404e41f13f254e9fc4babf376a17faae0d084e3fe4caa53bdc
-AUX 0.7.1/noad-blacklist 277 RMD160 b3e27398efb59ff3153db3daa5b2c4fb58d7a2ff SHA1 6992c0ffd9797b2aa849740f3644b155d8bc7e87 SHA256 1096f6d0af70b81967f9bbc5c87b00055bf0c00f3d3056a551275fc6aeda90cd
 AUX 0.7.1/noad-reccmd 145 RMD160 928c85fbd77afa5239ae3c7ef3923e2cfd0f61af SHA1 0ff3d16a7178b7fd47f849a8adcc358584d839e6 SHA256 f9d3c963f1c745cd671925c1a48c5e4785cfc913c416dc0fd5963ff625e4a653
 AUX 0.7.1/reccmds.noad.conf 61 RMD160 c62bdb45da8ae9aabfbd7a688f4600a5af04397f SHA1 d5fe02b78a5abd932fe0d6a5769bc8aa2e3ca54c SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d
-AUX 0.7.1/record-50-noad.sh 2100 RMD160 c50fe6ca9f77866dd944bf5185491ab42fc1c809 SHA1 49f12aa608e5e8e7fed1ac21471b76af880f9f54 SHA256 d3eb522f9094f0e66d294d532fd1f2917b00b2921b28b6b2ffeaad5b23b8d710
+AUX 0.7.1/record-50-noad.sh 1567 RMD160 137d42dc529e7aeb870431297752588384c5f8c3 SHA1 e9811601a5782c9f053e0e315b40f11ead49dffa SHA256 a588586b051eafc7513668e579214f98570cf9e4432879c47ceb588e5a7ec15d
 AUX patches-0.6.0/as-needed.diff 978 RMD160 d6c74670793b76f5cc9f3ea740b001a9034c5b2a SHA1 83885096cfe13c28912fe69afd9d708f9e22caf4 SHA256 a4f8cbdeeba303ab659bafc75f5d622b1ceec6945d3c35e4f0c559d3504e8ed9
 AUX patches-0.6.0/cflags.diff 1065 RMD160 a19296d791068e56fdb9d76b054a654b79c16113 SHA1 5c3ad0caa5bee3fc977a6894003e3435475eeddd SHA256 7247f4dd7eade6b39808797c4bb2476bd678f98e8b4ac5aad9c7c99e8def331e
 AUX patches-0.6.0/delete-while-scanning.diff 707 RMD160 f9a9878c2b5dbf201296c095fbc7d779d3d26cb2 SHA1 a069dc2d52082481691ed4968b04d5549d93d321 SHA256 762db9658661013e32cb115c137652ed4167ff89152ea52152267dfc96cbba91
@@ -30,14 +29,14 @@ DIST noad-0.7.0.20100119.tar.bz2 173003 RMD160 6d5ec182355d2a946872f0b4a74a788a5
 DIST noad-0.7.1.tar.bz2 175081 RMD160 5bba0456d86c2c0e04edd4c99f2d8612a2713b44 SHA1 9cbde315e51158548ea58c6879db690e0edc5c31 SHA256 c036f2759c11a9cd3fd94d4b1a83fbb5bb8e70026e93fffc6ad4a53b379e8387
 EBUILD noad-0.6.0-r9.ebuild 2646 RMD160 c15910b990adca073f044eb7fafa1781b34aad86 SHA1 c2fffe220aa6fd590ee9b82e334ec6684a6745c2 SHA256 c2ba17500a4959f24147eb90e3d1f4d6c19b675265a87c5fb7607ae090d7fc91
 EBUILD noad-0.7.0.20100119.ebuild 2183 RMD160 99b8788531c38bb4d445141366c9581d8e142690 SHA1 970083df9835219e8d4980faf88dcabe2a3968ec SHA256 43ec8b9fd178d2bba1e40ac1ad0acd93cfc931ad2808f07258b721a061e1b62f
-EBUILD noad-0.7.1.ebuild 2114 RMD160 7c82ddf5b387fd1490a5294ab264615fb713dd2c SHA1 8d52709b84e8180217624e7436f79af1d16cdd44 SHA256 abcf33b6acf2becd940f824d6455ff1d19e81080faa98ee0cf80a26e31f98ec2
-MISC ChangeLog 8420 RMD160 1da219bdb97a955e85f769c3b1e2077b4ff46ff8 SHA1 3683be24ef49da0dbd632d581381f2b418f77a9a SHA256 e98e89755d2bf26efe31e830cd05c6970d3ad4b3a2583bb6d1c647efd25bcfea
+EBUILD noad-0.7.1-r1.ebuild 1941 RMD160 af06be43b816857a9d7e936e2ce516a7c0b517fd SHA1 42ed5cb72344cd1f1408bb4e639e736f39b323eb SHA256 a94f729ebb6f5b21cfd967cc64770a0e1df55b9dab0a940bbac36535f145ebae
+MISC ChangeLog 8649 RMD160 e45a549370d05091b18fcb95dcd20a75ac134ee8 SHA1 83d7944f5f42c9ad21c1177b8cf44d704e18481f SHA256 2396001caae4dd2bf16fabe863835e0f025e17ce36ac545819c112fcc8d12f9e
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFLpktfdn07HTTCgIoRAhQzAJ9HIfSbiAEMw71ykFW6XlzaU8uQXwCeI87n
-t7usBcv1JVv0lg6zYz9pLEs=
-=XnZ6
+iD8DBQFLpowmdn07HTTCgIoRAkJeAJ0QZa1iaPJ6aG3G35h28UfSUd1tHwCeK4L9
+qaegCFkYsPgpuf9kzDPuxFA=
+=8bw7
 -----END PGP SIGNATURE-----
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"
 }