readded missing config files

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

7 files changed, 167 insertions, 12 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index de2a2706e4f9..582534f38976 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.52 2012/06/27 18:34:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.53 2012/07/04 21:33:43 hd_brummy Exp $
+
+  04 Jul 2012; Joerg Bornkessel <hd_brummy@gentoo.org> noad-0.7.3.ebuild,
+  +files/record-50-noad.sh, +files/confd_vdraddon.noad, +files/noad-reccmd,
+  +files/reccmds.noad.conf:
+  readded missing config files
 
   27 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/patches-0.7.x/noad-0.7.2-cflags.patch,
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index bbbb61fafb96..4cc4d2ce1ccd 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX confd_vdraddon.noad 1473 RMD160 74de925a58e14ba736fc204ecd5ae90d68c5a400 SHA1 e2de476193f7cb21ab002444b00aea1f8260bed3 SHA256 1cc26a68a3795bb287eddb2dc71fda7d7daa1d0d44fba3d569a505b6f1bad36e
+AUX noad-reccmd 145 RMD160 928c85fbd77afa5239ae3c7ef3923e2cfd0f61af SHA1 0ff3d16a7178b7fd47f849a8adcc358584d839e6 SHA256 f9d3c963f1c745cd671925c1a48c5e4785cfc913c416dc0fd5963ff625e4a653
 AUX patches-0.7.x/noad-0.7.3-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
 AUX patches-0.7.x/noad-0.7.3_gcc-4.7.diff 527 RMD160 d2ba41f011c6b5c5c212ed2370878d4fe4c4e559 SHA1 fa841d2e05b940a464eb94d70d826d1b3bf036a5 SHA256 571a5b208370ce1336b6ccb4d60a0b27f216c4682548f1d9097ef05463a2ae3f
 AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2
+AUX reccmds.noad.conf 61 RMD160 c62bdb45da8ae9aabfbd7a688f4600a5af04397f SHA1 d5fe02b78a5abd932fe0d6a5769bc8aa2e3ca54c SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d
+AUX record-50-noad.sh 1561 RMD160 ff9968ad5f4de6847e1d7963f3fab193066b40e1 SHA1 cbf3c6a344e1dcfa99d67982576f6e605984d9fc SHA256 aab6b817dfd01664605db4f40352bc8b7ef5d71599375b70288472fad107e017
 DIST noad-0.7.3.tar.bz2 174036 RMD160 a5b4b9ec272b0662c896a32ffbbbb74da088d33c SHA1 317de559d0fb784c70070760c41f06ec6fbcc122 SHA256 6fb597fb0ae0e4c4c954f2feb89dcc88c4852a0f0845aa214606996abb29f6cb
-EBUILD noad-0.7.3.ebuild 2186 RMD160 e784e5338ecaeeec754768df43897e48fde9dd2a SHA1 b4fc58b602f7c03f47b06e53a2412e9e2c9ab254 SHA256 17a188a896c2e88a75ad002a5ae7ec15100cd7a6980a61e778baa12adfd33866
-MISC ChangeLog 11541 RMD160 0e41ddf97f3c66c7b3d183858b0bc1b5e1acd17f SHA1 2a62507ab9da2a96990c927a460f9d730f2609fe SHA256 742df78a5eb9e669a378798eb5d88e515b1180b40460678cece1e0abab56187e
+EBUILD noad-0.7.3.ebuild 2140 RMD160 a6fe623ceeedc175fa4256bc869493026c510661 SHA1 60e5be7c04be8b5d558a46f2944598cd4b3d65d7 SHA256 18423f9e4c114e98a5485c6e7e6be2713162e41083302d57d28c0cb47dff9a4c
+MISC ChangeLog 11751 RMD160 3e64a43f1a687dec40996fcb79c515853bbf3451 SHA1 1cf9771ffbf8fa937261963d8f3636e424d814ee SHA256 e32776cd22b91690fff32c1e6c1fd3118ae74f16c0e7b76897d7aa6f1a30220d
 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
 
-iD8DBQFP61I7dn07HTTCgIoRAncQAJ9yavYYw/SLjuUqaCBJqt7UC76jHACglHic
-Ag0ZJKPjXmZ4TADJL40N7VQ=
-=6Uqx
+iD8DBQFP9LbCdn07HTTCgIoRAmeHAJ0bMlW1pHBSFTmf0clxIcAhHKq4RACeNzq5
+GahY5lOgB5pi7KfhzWO4J4Y=
+=qwQS
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/confd_vdraddon.noad b/media-video/noad/files/confd_vdraddon.noad
new file mode 100644
index 000000000000..448bd77e3905
--- /dev/null
+++ b/media-video/noad/files/confd_vdraddon.noad
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/confd_vdraddon.noad,v 1.1 2012/07/04 21:33:43 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 ( >=vdr-1.7.15 localhost:6419 )
+#	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/noad-reccmd b/media-video/noad/files/noad-reccmd
new file mode 100644
index 000000000000..3979baa574f9
--- /dev/null
+++ b/media-video/noad/files/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/reccmds.noad.conf b/media-video/noad/files/reccmds.noad.conf
new file mode 100644
index 000000000000..5d35495a90b8
--- /dev/null
+++ b/media-video/noad/files/reccmds.noad.conf
@@ -0,0 +1 @@
+Scan for Commercials (noad)		:/usr/share/vdr/bin/noad-reccmd
diff --git a/media-video/noad/files/record-50-noad.sh b/media-video/noad/files/record-50-noad.sh
new file mode 100644
index 000000000000..b896ba8af682
--- /dev/null
+++ b/media-video/noad/files/record-50-noad.sh
@@ -0,0 +1,67 @@
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/record-50-noad.sh,v 1.1 2012/07/04 21:33:43 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
+
+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/noad-0.7.3.ebuild b/media-video/noad/noad-0.7.3.ebuild
index bd2e8f119959..42bd2ca1e560 100644
--- a/media-video/noad/noad-0.7.3.ebuild
+++ b/media-video/noad/noad-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3.ebuild,v 1.3 2012/06/27 18:34:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3.ebuild,v 1.4 2012/07/04 21:33:43 hd_brummy Exp $
 
 EAPI="4"
 
@@ -60,20 +60,19 @@ src_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
+	newconfd "${FILEDIR}"/confd_vdraddon.noad vdraddon.noad
 
 	insinto /usr/share/vdr/record
-	doins "${CONF_SOURCE}"/record-50-noad.sh
+	doins "${FILESDIR}"/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
+	doins "${FILESDIR}"/reccmds.noad.conf
 
 	exeinto /usr/share/vdr/bin
-	doexe "${CONF_SOURCE}"/noad-reccmd
+	doexe "${FILESDIR}"/noad-reccmd
 }
 
 pkg_postinst() {