version bump, thx to T.Rheinhold

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

12 files changed, 311 insertions, 182 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 25863f949ef3..175dc1016be8 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,17 @@
 # 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.38 2010/02/27 23:51:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.39 2010/03/21 16:42:30 hd_brummy Exp $
+
+*noad-0.7.1 (21 Mar 2010)
+
+  21 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/0.7.1/confd_vdraddon.noad, -noad-0.6.0-r7.ebuild,
+  -noad-0.6.0-r8.ebuild, +files/patches-0.7.x/noad-0.7.1-hangcheck.diff,
+  +files/0.7.1/noad-blacklist,
+  +files/patches-0.7.x/noad-0.7.1-ts_extension.diff, +noad-0.7.1.ebuild,
+  +files/0.7.1/record-50-noad.sh, +files/0.7.1/noad-reccmd,
+  +files/0.7.1/reccmds.noad.conf:
+  version bump, thx to T.Rheinhold
 
   27 Feb 2010; Joerg Bornkessel <hd_brummy@gentoo.org> -noad-0.7.0.ebuild:
   cleanup
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 924903d7f8a9..ebee69f71a9d 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -5,6 +5,11 @@ AUX 0.6.0-r7/confd_vdraddon.noad 1443 RMD160 aa1dd8349139cb1aebfb06a759e57370ca6
 AUX 0.6.0-r7/noad-reccmd 145 RMD160 928c85fbd77afa5239ae3c7ef3923e2cfd0f61af SHA1 0ff3d16a7178b7fd47f849a8adcc358584d839e6 SHA256 f9d3c963f1c745cd671925c1a48c5e4785cfc913c416dc0fd5963ff625e4a653
 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 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
@@ -17,20 +22,22 @@ AUX patches-0.6.0/new-ffmpeg-extern-c.diff 316 RMD160 c90e734ef1b105833a13e1dbd6
 AUX patches-0.6.0/series 126 RMD160 8b73b009a02477de8bf24980cab7260036a84c34 SHA1 bf359b445135235a38d5bcd39c7e38a80c542902 SHA256 a74330aed7d138edccfc1477626d830f21844fdd4b7929a5cae6176722f2b60a
 AUX patches-0.7.x/noad-0.7.0.20100119-asneeded.patch 389 RMD160 cab42bdd50b110ee9034abd305a027736bd14009 SHA1 0667e2fa1ea099f2a7a2864e7daa3068778174e2 SHA256 d89f1ba460ab86ee65245c1a9e8d77b260b0b225c2b240c52f956b6356a4b2d4
 AUX patches-0.7.x/noad-0.7.0_gcc-4.4.diff 2023 RMD160 cc199fc64fdbad9f87ac7cb41965208bf5936042 SHA1 8c95de380a16019de7bdfa293a0dff9f584348cf SHA256 bb7d6b7ee1a9275a8dddf3cb5557c7643acf06f1c5cddd415e9ebc1737d96c7b
+AUX patches-0.7.x/noad-0.7.1-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
+AUX patches-0.7.x/noad-0.7.1-ts_extension.diff 334 RMD160 277d89598555966b1af4f226ba26b5b04404a825 SHA1 4dc5f76d29e4bb70c67a9dacc3884580e9c80e6b SHA256 a7d6fc55e447fc3cc8ced7e706c5f65ef94aa0dce2f1293dbdd156b04cbeedcd
 AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2
 DIST noad-0.6.0.tar.bz2 151369 RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd SHA1 21ade875f92b5f3a24456fbf6897634966bb0286 SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183
 DIST noad-0.7.0.20100119.tar.bz2 173003 RMD160 6d5ec182355d2a946872f0b4a74a788a5dd8acc4 SHA1 533fdc433da7b7c889682cc7813a08a57b34660f SHA256 fdebe0c497d5d2254c5bc400a95d6190d713263e0b83f6f83392ec41c0c3053d
-EBUILD noad-0.6.0-r7.ebuild 2146 RMD160 bb23317285f368cc575cad44c7ccc36b5d8e3847 SHA1 ae0a49fd38b1884dd2fb5b10b1c36c774c113fff SHA256 aa8660ebeb71d09278f85274a3c89b0efe78fbc599a8f05923fdfa8216d67aaa
-EBUILD noad-0.6.0-r8.ebuild 2299 RMD160 4e4f1b28008a8e3ccc25db9476020c8de35cb55d SHA1 8c60d0b3477c51009ecff14d79fea4e7f4bde68d SHA256 7bb7ee37484571c73518b29c79ec6106bcc13e1c2cdc0ba8ff93f971b927819f
+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
-MISC ChangeLog 7972 RMD160 762781e6529b7af522e1781dc9e4b2f810ee183e SHA1 0b1bd9ccc51d30ea217e54a23a2a305b4739a258 SHA256 b0de0796ad4369f5a43b81c3b178003433fa173f1c7e28074e32e637224a0a68
+EBUILD noad-0.7.1.ebuild 2114 RMD160 7c82ddf5b387fd1490a5294ab264615fb713dd2c SHA1 8d52709b84e8180217624e7436f79af1d16cdd44 SHA256 abcf33b6acf2becd940f824d6455ff1d19e81080faa98ee0cf80a26e31f98ec2
+MISC ChangeLog 8420 RMD160 1da219bdb97a955e85f769c3b1e2077b4ff46ff8 SHA1 3683be24ef49da0dbd632d581381f2b418f77a9a SHA256 e98e89755d2bf26efe31e830cd05c6970d3ad4b3a2583bb6d1c647efd25bcfea
 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
 
-iD8DBQFLia8tdn07HTTCgIoRAvr5AKCsj/EGxdS8dcNwPPmxoi/4sF3u5ACfbBo+
-wrRAGQlNKmmtz3EvU3XcVL8=
-=KlHg
+iD8DBQFLpktfdn07HTTCgIoRAhQzAJ9HIfSbiAEMw71ykFW6XlzaU8uQXwCeI87n
+t7usBcv1JVv0lg6zYz9pLEs=
+=XnZ6
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/0.7.1/confd_vdraddon.noad b/media-video/noad/files/0.7.1/confd_vdraddon.noad
new file mode 100644
index 000000000000..59a2e1a8e42c
--- /dev/null
+++ b/media-video/noad/files/0.7.1/confd_vdraddon.noad
@@ -0,0 +1,71 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.7.1/confd_vdraddon.noad,v 1.1 2010/03/21 16:42:27 hd_brummy Exp $
+
+#########
+##
+# 	run Noad
+# 	available Parameter
+# 	no | yes
+#
+VDR_USE_NOAD="yes"
+
+##	do online scan while recording
+#	you can choose between
+#		no   - disable online scan
+#		live - scan only live recordings online (named @...)
+#		all  - scan all recordings with online mode
+#	available Parameter
+#	no | live | all
+#
+NOAD_ONLINE="no"
+
+##	Use this nice-level when running noad / or no-niceness
+#	available Parameter
+#	no | 0 ... 19
+#NOAD_NICE_LEVEL="no"
+NOAD_NICE_LEVEL="18"
+
+##	use ac3 detection
+# 	available Parameter
+# 	yes | no
+#
+NOAD_AC3="yes"
+
+##	detect jumping logos
+# 	available Parameter
+# 	yes | no
+#
+NOAD_JUMP="yes"
+
+##	detect overlaps
+#	available Parameter
+#	yes | no
+#
+NOAD_OVERLAP="yes"
+
+##	send an OSD-Message to localhost:2001 for start and end 
+# 	available Parameter
+# 	yes | no
+#
+NOAD_MESSAGES="yes"
+
+##	only scan if sharemarks did not produce an ptsmarks.vdr file
+#	available Parameter
+#	yes | no
+NOAD_ONLY_SCAN_IF_NO_PTSMARKS="yes"
+
+##	only scan if there are no cut-marks already there (cutting while vdr still records)
+#	available Parameter
+#	yes | no
+NOAD_ONLY_SCAN_IF_NO_MARKS="yes"
+
+##	add your own parameter here,
+# 	yust run 'noad' in konsole for more parameter
+NOAD_PARAMETER=""
+
+
+
+
+
+
diff --git a/media-video/noad/files/0.7.1/noad-blacklist b/media-video/noad/files/0.7.1/noad-blacklist
new file mode 100644
index 000000000000..c91a6fa3bd5a
--- /dev/null
+++ b/media-video/noad/files/0.7.1/noad-blacklist
@@ -0,0 +1,7 @@
+# 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/noad-reccmd b/media-video/noad/files/0.7.1/noad-reccmd
new file mode 100644
index 000000000000..3979baa574f9
--- /dev/null
+++ b/media-video/noad/files/0.7.1/noad-reccmd
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+VDR_RECORD_STATE=reccmd
+VDR_RECORD_NAME="${1}"
+
+. /usr/share/vdr/record/record-50-noad.sh "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}"
+
diff --git a/media-video/noad/files/0.7.1/reccmds.noad.conf b/media-video/noad/files/0.7.1/reccmds.noad.conf
new file mode 100644
index 000000000000..5d35495a90b8
--- /dev/null
+++ b/media-video/noad/files/0.7.1/reccmds.noad.conf
@@ -0,0 +1 @@
+Scan for Commercials (noad)		:/usr/share/vdr/bin/noad-reccmd
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
new file mode 100644
index 000000000000..bd20ba35753c
--- /dev/null
+++ b/media-video/noad/files/0.7.1/record-50-noad.sh
@@ -0,0 +1,83 @@
+# $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 $
+#
+# Joerg Bornkessel <hd_brummy@gentoo.org>
+# Mathias Schwarzott <zzam@gentoo.org>
+#
+
+. /etc/conf.d/vdraddon.noad
+
+CMD="/usr/bin/noad"
+
+# Parameter to start 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
+	FORCE_OFFLINE_SCAN=yes
+	VDR_RECORD_STATE=after
+fi
+
+
+if [ "${FORCE_OFFLINE_SCAN}" != "yes" ]; then
+	# allow it to abort on certain conditions
+
+	# automatic noad scan disabled
+	[ "${VDR_USE_NOAD}" = "yes" ] || return
+
+	# ptsmarks existing
+	if [ "${NOAD_ONLY_SCAN_IF_NO_PTSMARKS}" = "yes" ]; then
+		[ -f "${VDR_RECORD_NAME}/ptsmarks.vdr" ] && return
+	fi
+
+	# marks existing
+	if [ "${NOAD_ONLY_SCAN_IF_NO_MARKS}" = "yes" ]; then
+		[ -f "${VDR_RECORD_NAME}/marks.vdr" ] && return
+	fi
+
+	# Add Online-scanning parameter
+	case "${NOAD_ONLINE}" in
+		live|yes)
+			CMD="${CMD} --online=1"
+			;;
+		all)
+			CMD="${CMD} --online=2"
+			;;
+		no)
+			# abort stage "before" here
+			[ "${VDR_RECORD_STATE}" = "before" ] && return
+			;;
+	esac
+fi
+
+[ "${NOAD_AC3}" = "yes" ] && CMD="${CMD} -a"
+[ "${NOAD_JUMP}" = "yes" ] && CMD="${CMD} -j"
+[ "${NOAD_OVERLAP}" = "yes" ] && CMD="${CMD} -o"
+[ "${NOAD_MESSAGES}" = "yes" ] && CMD="${CMD} -O"
+
+: ${NOAD_NICE_LEVEL:=18}
+if [ "${NOAD_NICE_LEVEL}" != "no" ]; then
+	NOAD_NICE_LEVEL=$(($NOAD_NICE_LEVEL+0))
+	CMD="nice -n ${NOAD_NICE_LEVEL} ${CMD}"
+fi
+
+CMD="${CMD} ${NOAD_PARAMETER}"
+${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" 
+
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.1-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.1-hangcheck.diff
new file mode 100644
index 000000000000..37788a197fd7
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.1-hangcheck.diff
@@ -0,0 +1,21 @@
+diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp
+--- noad-0.6.0-orig/main.cpp	2007-05-12 17:28:01.000000000 +0200
++++ noad-0.6.0/main.cpp	2007-05-12 18:20:30.000000000 +0200
+@@ -566,10 +566,17 @@
+     signal(SIGABRT, signal_handler);
+     signal(SIGSEGV, signal_handler);
+     signal(SIGUSR1, signal_handler);
++    signal(SIGALRM, signal_handler);
+     
+     // do cleanup at exit...
+     atexit(cleanUp);
+     
++   
++    if (!bOnline) {
++       // now start alarm timer to kill hanging noad (hardcoded 30min timeout)
++       alarm(30*60);
++    }
++    
+     // now do the work..,
+     doNoad(bBefore, recDir);
+ 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.1-ts_extension.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.1-ts_extension.diff
new file mode 100644
index 000000000000..5f3e95a23321
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.1-ts_extension.diff
@@ -0,0 +1,13 @@
+http://article.gmane.org/gmane.linux.vdr/42461/
+--- noad/noadifnew      2010-03-14 22:27:15.000000000 +0200
++++ noad-fix/noadifnew  2010-03-14 22:27:41.000000000 +0200
+@@ -12,7 +12,8 @@
+    exit -1
+ fi
+ fil="$2/marks.vdr"
+-if  test -a $fil
++filts="$2/marks"
++if [ -e $fil -o -e $filts ]
+ then
+   echo "noad already done for $2"
+ else
diff --git a/media-video/noad/noad-0.6.0-r7.ebuild b/media-video/noad/noad-0.6.0-r7.ebuild
deleted file mode 100644
index 4d11f7fd464f..000000000000
--- a/media-video/noad/noad-0.6.0-r7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r7.ebuild,v 1.6 2007/11/27 11:45:45 zzam Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils autotools
-
-DESCRIPTION="Mark commercial Breaks in VDR records"
-HOMEPAGE="http://www.freepgs.com/noad/"
-SRC_URI="http://www.freepgs.com/${PN}/${P}.tar.bz2
-		mirror://vdrfiles/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="ffmpeg imagemagick"
-
-DEPEND="media-libs/libmpeg2
-	media-video/vdr
-	ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
-	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )"
-RDEPEND=">=media-tv/gentoo-vdr-scripts-0.3.5"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/patches-${PV}/directoryfix.diff
-	epatch "${FILESDIR}"/patches-${PV}/as-needed.diff
-	epatch "${FILESDIR}"/patches-${PV}/cflags.diff
-	epatch "${FILESDIR}"/patches-${PV}/framesize.diff
-	epatch "${FILESDIR}"/patches-${PV}/delete-while-scanning.diff
-	epatch "${FILESDIR}"/patches-${PV}/fix-osd.patch
-
-	rm configure
-	eautoreconf
-}
-
-src_compile() {
-
-	econf \
-		$(use_with ffmpeg) \
-		$(use_with imagemagick magick) \
-		--with-tools \
-		--with-mpeginclude=/usr/include/mpeg2dec
-
-	emake || die "emake faild"
-}
-
-src_install() {
-
-	dobin noad showindex
-	use imagemagick && dobin markpics
-
-	dodoc README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	CONF_SOURCE="${FILESDIR}/0.6.0-r7"
-	newconfd "${CONF_SOURCE}"/confd_vdraddon.noad vdraddon.noad
-
-	insinto /usr/share/vdr/record
-	doins "${CONF_SOURCE}"/record-50-noad.sh
-
-	insinto /etc/vdr/reccmds
-	doins "${CONF_SOURCE}"/reccmds.noad.conf
-
-	exeinto /usr/share/vdr/bin
-	doexe "${CONF_SOURCE}"/noad-reccmd
-}
-
-pkg_postinst() {
-
-	elog
-	elog "Congratulations, you have just installed noad!,"
-	elog "To integrate noad in VDR you should do this:"
-	elog
-	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
-	elog
-	elog "Note: You can use here all pararmeters for noad,"
-	elog "please look in the documentation of noad."
-	elog
-}
diff --git a/media-video/noad/noad-0.6.0-r8.ebuild b/media-video/noad/noad-0.6.0-r8.ebuild
deleted file mode 100644
index 46fb4fa7c31e..000000000000
--- a/media-video/noad/noad-0.6.0-r8.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r8.ebuild,v 1.3 2007/11/27 11:45:45 zzam Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils autotools
-
-DESCRIPTION="Mark commercial Breaks in VDR records"
-HOMEPAGE="http://www.freepgs.com/noad/"
-SRC_URI="http://www.freepgs.com/${PN}/${P}.tar.bz2
-		mirror://vdrfiles/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg imagemagick"
-
-DEPEND="media-libs/libmpeg2
-	media-video/vdr
-	ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
-	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )"
-RDEPEND=">=media-tv/gentoo-vdr-scripts-0.3.5"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/patches-${PV}/directoryfix.diff
-	epatch "${FILESDIR}"/patches-${PV}/as-needed.diff
-	epatch "${FILESDIR}"/patches-${PV}/cflags.diff
-	epatch "${FILESDIR}"/patches-${PV}/framesize.diff
-	epatch "${FILESDIR}"/patches-${PV}/delete-while-scanning.diff
-	epatch "${FILESDIR}"/patches-${PV}/fix-osd.patch
-	epatch "${FILESDIR}"/patches-${PV}/hangcheck.diff
-
-	rm configure
-	eautoreconf
-}
-
-src_compile() {
-
-	econf \
-		$(use_with ffmpeg) \
-		$(use_with imagemagick magick) \
-		--with-tools \
-		--with-mpeginclude=/usr/include/mpeg2dec
-
-	emake || die "emake faild"
-}
-
-src_install() {
-
-	dobin noad showindex
-	use imagemagick && dobin markpics
-
-	dodoc README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	CONF_SOURCE="${FILESDIR}/0.6.0-r7"
-	newconfd "${CONF_SOURCE}"/confd_vdraddon.noad vdraddon.noad
-
-	insinto /usr/share/vdr/record
-	doins "${CONF_SOURCE}"/record-50-noad.sh
-
-	insinto /etc/vdr/reccmds
-	doins "${CONF_SOURCE}"/reccmds.noad.conf
-
-	exeinto /usr/share/vdr/bin
-	doexe "${CONF_SOURCE}"/noad-reccmd
-}
-
-pkg_postinst() {
-
-	elog
-	elog "Congratulations, you have just installed noad!,"
-	elog "To integrate noad in VDR you should do this:"
-	elog
-	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
-	elog
-	elog "Note: You can use here all pararmeters for noad,"
-	elog "please look in the documentation of noad."
-	elog
-	elog "noad now contains a hangcheck timer, to kill noad"
-	elog "if it runs longer than 30 minutes."
-}
diff --git a/media-video/noad/noad-0.7.1.ebuild b/media-video/noad/noad-0.7.1.ebuild
new file mode 100644
index 000000000000..4255742fdc8e
--- /dev/null
+++ b/media-video/noad/noad-0.7.1.ebuild
@@ -0,0 +1,83 @@
+# 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 $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Mark commercial Breaks in VDR records"
+HOMEPAGE="http://noad.heliohost.org/"
+SRC_URI="http://noad.heliohost.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg imagemagick"
+
+DEPEND="media-libs/libmpeg2
+	ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
+	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff \
+		"${FILESDIR}"/patches-0.7.x/"${P}"-ts_extension.diff
+}
+
+src_configure() {
+
+	local=myconf
+	use ffmpeg && myconf="--with-ffmpeg --with-ffmpeginclude=/usr/include"
+
+	econf \
+	${myconf} \
+	$(use_with imagemagick magick) \
+	--with-mpeginclude=/usr/include/mpeg2dec
+#	--with-tools # fails on showindex, marcpics compile
+}
+
+src_install() {
+
+	dobin noad
+#       fix me later!
+#       dobin noad showindex
+#	use imagemagick && dobin markpics
+
+	dodoc README INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
+
+	CONF_SOURCE="${FILESDIR}/0.7.1"
+	newconfd "${CONF_SOURCE}"/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins "${CONF_SOURCE}"/record-50-noad.sh
+
+	insinto /usr/share/vdr/shutdown
+	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
+
+	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
+}
+
+pkg_postinst() {
+
+	elog
+	elog "Congratulations, you have just installed noad!,"
+	elog "To integrate noad in VDR you should do this:"
+	elog
+	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	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"
+}