Marked 0.6.0-r7 stable on x86. Cleanup of all older ebuilds.

(Portage version: 2.1.2-r8)

21 files changed, 13 insertions, 719 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 7107e17d24a1..baedae64c4cc 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.17 2007/01/05 17:18:22 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.18 2007/02/07 10:55:31 zzam Exp $
+
+  07 Feb 2007; Matthias Schwarzott <zzam@gentoo.org>
+  -files/0.6.0-r3/confd_vdraddon.noad, -files/0.6.0-r3/noad-reccmd,
+  -files/0.6.0-r3/reccmds.noad.conf, -files/0.6.0-r5/confd_vdraddon.noad,
+  -files/record-20-noad.sh, -files/0.6.0-r3/record-50-noad.sh,
+  -files/0.6.0-r5/noad-reccmd, -files/0.6.0-r5/reccmds.noad.conf,
+  -files/0.6.0-r5/record-50-noad.sh, -files/reccmds.noad.conf,
+  -files/vdraddon.noad, -noad-0.6.0-r2.ebuild, -noad-0.6.0-r4.ebuild,
+  -noad-0.6.0-r5.ebuild, -noad-0.6.0-r6.ebuild, noad-0.6.0-r7.ebuild:
+  Marked 0.6.0-r7 stable on x86. Cleanup of all older ebuilds.
 
   05 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org> noad-0.6.0-r2.ebuild,
   noad-0.6.0-r4.ebuild, noad-0.6.0-r5.ebuild, noad-0.6.0-r6.ebuild,
diff --git a/media-video/noad/files/0.6.0-r3/confd_vdraddon.noad b/media-video/noad/files/0.6.0-r3/confd_vdraddon.noad
deleted file mode 100644
index 576456edce52..000000000000
--- a/media-video/noad/files/0.6.0-r3/confd_vdraddon.noad
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.6.0-r3/confd_vdraddon.noad,v 1.3 2006/06/24 14:45:00 zzam 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 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"
-
-##	add your own parameter here,
-# 	yust run 'noad' in konsole for more parameter
-NOAD_PARAMETER=""
-
-
-
-
-
-
diff --git a/media-video/noad/files/0.6.0-r3/noad-reccmd b/media-video/noad/files/0.6.0-r3/noad-reccmd
deleted file mode 100644
index 069a292f25cf..000000000000
--- a/media-video/noad/files/0.6.0-r3/noad-reccmd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-VDR_RECORD_STATE=reccmd
-VDR_RECORD_NAME="${1}"
-
-source /usr/share/vdr/record/record-50-noad.sh "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}"
-
diff --git a/media-video/noad/files/0.6.0-r3/reccmds.noad.conf b/media-video/noad/files/0.6.0-r3/reccmds.noad.conf
deleted file mode 100644
index 5d35495a90b8..000000000000
--- a/media-video/noad/files/0.6.0-r3/reccmds.noad.conf
+++ /dev/null
@@ -1 +0,0 @@
-Scan for Commercials (noad)		:/usr/share/vdr/bin/noad-reccmd
diff --git a/media-video/noad/files/0.6.0-r3/record-50-noad.sh b/media-video/noad/files/0.6.0-r3/record-50-noad.sh
deleted file mode 100644
index 87d0db4665cd..000000000000
--- a/media-video/noad/files/0.6.0-r3/record-50-noad.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r3/record-50-noad.sh,v 1.2 2006/06/24 08:58:53 zzam Exp $
-#
-# Joerg Bornkessel <hd_brummy@gentoo.org>
-# Mathias Schwarzott <zzam@gentoo.org>
-#
-
-source /etc/conf.d/vdraddon.noad
-
-CMD="/usr/bin/noad"
-
-# Parameter to start NoAd
-# parameter are "no | yes"
-
-
-ALLOW_ONLINE=yes
-
-if [[ ${VDR_RECORD_STATE} == reccmd ]]; then
-	# script started from reccmd
-	VDR_USE_NOAD=yes
-	VDR_RECORD_STATE=after
-	ALLOW_ONLINE=no
-	NOAD_ONLY_SCAN_IF_NO_PTSMARKS=no
-fi
-
-[[ ${VDR_USE_NOAD} == "yes" ]] || return
-
-
-case "${VDR_RECORD_STATE}" in
-after)	: ;;
-
-before)	[[ "${NOAD_ONLINE}" == "no" ]] && return ;;
-
-*)	return ;;
-esac
-
-if [[ ${ALLOW_ONLINE} == yes ]]; then
-	case "${NOAD_ONLINE}" in
-		live|yes)
-			CMD="${CMD} --online=1"
-			;;
-		all)
-			CMD="${CMD} --online=2"
-			;;
-	esac
-fi
-
-if [[ ${NOAD_ONLY_SCAN_IF_NO_PTSMARKS} == yes ]]; then
-	[[ -f ${VDR_RECORD_NAME}/ptsmarks.vdr ]] && return
-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"
-
-
-CMD="${CMD} ${NOAD_PARAMETER}"
-${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" 
-
diff --git a/media-video/noad/files/0.6.0-r5/confd_vdraddon.noad b/media-video/noad/files/0.6.0-r5/confd_vdraddon.noad
deleted file mode 100644
index 9b21b7adf7bb..000000000000
--- a/media-video/noad/files/0.6.0-r5/confd_vdraddon.noad
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.6.0-r5/confd_vdraddon.noad,v 1.1 2006/10/07 11:19:01 zzam 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"
-
-##	start noad with nice
-#	available Parameter
-#	yes | no
-NOAD_NICE="yes"
-
-##	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"
-
-##	add your own parameter here,
-# 	yust run 'noad' in konsole for more parameter
-NOAD_PARAMETER=""
-
-
-
-
-
-
diff --git a/media-video/noad/files/0.6.0-r5/noad-reccmd b/media-video/noad/files/0.6.0-r5/noad-reccmd
deleted file mode 100644
index 069a292f25cf..000000000000
--- a/media-video/noad/files/0.6.0-r5/noad-reccmd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-VDR_RECORD_STATE=reccmd
-VDR_RECORD_NAME="${1}"
-
-source /usr/share/vdr/record/record-50-noad.sh "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}"
-
diff --git a/media-video/noad/files/0.6.0-r5/reccmds.noad.conf b/media-video/noad/files/0.6.0-r5/reccmds.noad.conf
deleted file mode 100644
index 5d35495a90b8..000000000000
--- a/media-video/noad/files/0.6.0-r5/reccmds.noad.conf
+++ /dev/null
@@ -1 +0,0 @@
-Scan for Commercials (noad)		:/usr/share/vdr/bin/noad-reccmd
diff --git a/media-video/noad/files/0.6.0-r5/record-50-noad.sh b/media-video/noad/files/0.6.0-r5/record-50-noad.sh
deleted file mode 100644
index 85957348b364..000000000000
--- a/media-video/noad/files/0.6.0-r5/record-50-noad.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r5/record-50-noad.sh,v 1.1 2006/10/07 11:19:01 zzam Exp $
-#
-# Joerg Bornkessel <hd_brummy@gentoo.org>
-# Mathias Schwarzott <zzam@gentoo.org>
-#
-
-source /etc/conf.d/vdraddon.noad
-
-CMD="/usr/bin/noad"
-
-# Parameter to start NoAd
-# parameter are "no | yes"
-
-
-ALLOW_ONLINE=yes
-
-if [[ ${VDR_RECORD_STATE} == reccmd ]]; then
-	# script started from reccmd
-	VDR_USE_NOAD=yes
-	VDR_RECORD_STATE=after
-	ALLOW_ONLINE=no
-	NOAD_ONLY_SCAN_IF_NO_PTSMARKS=no
-fi
-
-[[ ${VDR_USE_NOAD} == "yes" ]] || return
-
-
-case "${VDR_RECORD_STATE}" in
-after)	: ;;
-
-before)	[[ "${NOAD_ONLINE}" == "no" ]] && return ;;
-
-*)	return ;;
-esac
-
-if [[ ${ALLOW_ONLINE} == yes ]]; then
-	case "${NOAD_ONLINE}" in
-		live|yes)
-			CMD="${CMD} --online=1"
-			;;
-		all)
-			CMD="${CMD} --online=2"
-			;;
-	esac
-fi
-
-if [[ ${NOAD_ONLY_SCAN_IF_NO_PTSMARKS} == yes ]]; then
-	[[ -f ${VDR_RECORD_NAME}/ptsmarks.vdr ]] && return
-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"
-
-if [[ ${NOAD_NICE} == yes ]]; then
-	CMD="nice ${CMD}"
-fi
-
-CMD="${CMD} ${NOAD_PARAMETER}"
-${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" 
-
diff --git a/media-video/noad/files/digest-noad-0.6.0-r2 b/media-video/noad/files/digest-noad-0.6.0-r2
deleted file mode 100644
index 05e249e57c9d..000000000000
--- a/media-video/noad/files/digest-noad-0.6.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369
-RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369
-SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369
diff --git a/media-video/noad/files/digest-noad-0.6.0-r4 b/media-video/noad/files/digest-noad-0.6.0-r4
deleted file mode 100644
index 05e249e57c9d..000000000000
--- a/media-video/noad/files/digest-noad-0.6.0-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369
-RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369
-SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369
diff --git a/media-video/noad/files/digest-noad-0.6.0-r5 b/media-video/noad/files/digest-noad-0.6.0-r5
deleted file mode 100644
index 05e249e57c9d..000000000000
--- a/media-video/noad/files/digest-noad-0.6.0-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369
-RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369
-SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369
diff --git a/media-video/noad/files/digest-noad-0.6.0-r6 b/media-video/noad/files/digest-noad-0.6.0-r6
deleted file mode 100644
index 05e249e57c9d..000000000000
--- a/media-video/noad/files/digest-noad-0.6.0-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369
-RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369
-SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369
diff --git a/media-video/noad/files/reccmds.noad.conf b/media-video/noad/files/reccmds.noad.conf
deleted file mode 100644
index 966642c645f5..000000000000
--- a/media-video/noad/files/reccmds.noad.conf
+++ /dev/null
@@ -1 +0,0 @@
-Starte NoaD			:/usr/bin/noad -a -o -O after "${2}"
diff --git a/media-video/noad/files/record-20-noad.sh b/media-video/noad/files/record-20-noad.sh
deleted file mode 100644
index 75e99b6b990b..000000000000
--- a/media-video/noad/files/record-20-noad.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/record-20-noad.sh,v 1.1 2006/03/26 23:03:13 hd_brummy Exp $
-#
-# Joerg Bornkessel <hd_brummy@gentoo.org>
-# Mathias Schwarzott <zzam@gentoo.org>
-#
-
-source /etc/conf.d/vdraddon.noad
-
-CMD="/usr/bin/noad"
-
-# Parameter to start NoAd
-# parameter are "no | liverecord | afterrecord"
-
-[[ ${VDR_USE_NOAD} != "no" ]] || return
-
-# Start NoAd after Record
-
-if [[ "${VDR_USE_NOAD}" == "afterrecord" ]] && [[ "${VDR_RECORD_STATE}" == "after" ]]; then
-	
-	[[ "${NOAD_AC3}" == "yes" ]] && CMD="${CMD} -a"
-
-	[[ "${NOAD_JUMP}" == "yes" ]] &&	CMD="${CMD} -j"
-
-	[[ "${NOAD_OVERLAP}" == "yes" ]] && CMD="${CMD} -o"
-
-	[[ "${NOAD_MESSAGES}" == "yes" ]] && CMD="${CMD} -O"
-
-	CMD="${CMD} ${NOAD_PARAMETER}"
-
-	${CMD} ${VDR_RECORD_STATE} "${2}" 
-fi
-
-# Section for noad on timeshift
-
-if [[ "${VDR_USE_NOAD}" == "liverecord" ]]; then
-	
-	[[ "${NOAD_AC3}" == "yes" ]] && CMD="${CMD} -a"
-
-	[[ "${NOAD_JUMP}" == "yes" ]] && CMD="${CMD} -j"
-
-	[[ "${NOAD_OVERLAP}" == "yes" ]] && CMD="${CMD} -o"
-
-	[[ "${NOAD_MESSAGES}" == "yes" ]] && CMD="${CMD} -O"
-
-	CMD="${CMD} --online"
-
-	CMD="${CMD} ${NOAD_PARAMETER}"
-	
-	${CMD} ${VDR_RECORD_STATE} "${2}"
-fi
-
-# uncomment for debug
-#echo $1 $2 >> /tmp/my-record-log-file
diff --git a/media-video/noad/files/vdraddon.noad b/media-video/noad/files/vdraddon.noad
deleted file mode 100644
index 02ca3353c1e4..000000000000
--- a/media-video/noad/files/vdraddon.noad
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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/vdraddon.noad,v 1.1 2006/03/26 23:03:13 hd_brummy Exp $
-
-#########
-##
-# 	run Noad
-# 	available Parameter
-# 	no | liverecord | afterrecord
-#
-VDR_USE_NOAD="afterrecord"
-
-##	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"
-
-##	add your own parameter here,
-# 	yust run 'noad' in konsole for more parameter
-NOAD_PARAMETER=""
-
-
-
-
-
-
diff --git a/media-video/noad/noad-0.6.0-r2.ebuild b/media-video/noad/noad-0.6.0-r2.ebuild
deleted file mode 100644
index 686b6721a96d..000000000000
--- a/media-video/noad/noad-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,85 +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-r2.ebuild,v 1.6 2007/01/05 17:18:22 hd_brummy Exp $
-
-inherit eutils
-
-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="x86 ~amd64"
-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 )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-directoryfix.diff
-
-	sed -i -e "s:-g -O3:$CXXFLAGS:" configure
-}
-
-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 COPYING README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	if has_version ">=media-tv/gentoo-vdr-scripts-0.1_alpha8"
-	then
-		insinto /etc/conf.d
-		doins ${FILESDIR}/vdraddon.noad
-
-		insinto /usr/lib/vdr/record
-		doins ${FILESDIR}/record-20-noad.sh
-
-		insinto /etc/vdr/reccmds
-		doins ${FILESDIR}/reccmds.noad.conf
-	fi
-}
-
-pkg_postinst() {
-
-	echo
-	elog "Congratulations, you have just installed noad!,"
-	elog "To integrate noad in VDR you should do this:"
-	echo
-	if has_version ">=media-tv/gentoo-vdr-scripts-0.1_alpha8"
-	then
-		elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
-	else
-		elog "Add in /etc/conf.d/vdr:"
-		echo
-		elog "RECORD=\"noad nice --statisticfile=/video/noad.stat\" "
-	fi
-	echo
-	elog "More infos can be found on vdr.gentoo.de"
-	echo
-	elog "Note: You can use here all pararmeters for noad,"
-	elog "please look in the documentation of noad."
-	echo
-}
diff --git a/media-video/noad/noad-0.6.0-r4.ebuild b/media-video/noad/noad-0.6.0-r4.ebuild
deleted file mode 100644
index d42de43c9bc1..000000000000
--- a/media-video/noad/noad-0.6.0-r4.ebuild
+++ /dev/null
@@ -1,85 +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-r4.ebuild,v 1.4 2007/01/05 17:18:22 hd_brummy 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="~x86 ~amd64"
-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}/${P}-directoryfix.diff
-	epatch ${FILESDIR}/${P}-as-needed.diff
-	epatch ${FILESDIR}/${P}-cflags.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 COPYING README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/0.6.0-r3/confd_vdraddon.noad vdraddon.noad
-
-	insinto /usr/share/vdr/record
-	doins ${FILESDIR}/0.6.0-r3/record-50-noad.sh
-
-	insinto /etc/vdr/reccmds
-	doins ${FILESDIR}/0.6.0-r3/reccmds.noad.conf
-
-	exeinto /usr/share/vdr/bin
-	doexe ${FILESDIR}/0.6.0-r3/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 "More infos can be found on vdr.gentoo.de"
-	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-r5.ebuild b/media-video/noad/noad-0.6.0-r5.ebuild
deleted file mode 100644
index d1d5a29aebbf..000000000000
--- a/media-video/noad/noad-0.6.0-r5.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-r5.ebuild,v 1.4 2007/01/05 17:18:22 hd_brummy 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="~x86 ~amd64"
-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}/${P}-directoryfix.diff
-	epatch ${FILESDIR}/${P}-as-needed.diff
-	epatch ${FILESDIR}/${P}-cflags.diff
-	epatch ${FILESDIR}/${P}-framesize.diff
-	epatch ${FILESDIR}/${P}-delete-while-scanning.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 COPYING README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	CONF_SOURCE=${FILESDIR}/0.6.0-r5
-	insinto /etc/conf.d
-	newins ${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-r6.ebuild b/media-video/noad/noad-0.6.0-r6.ebuild
deleted file mode 100644
index 22ad5078e7b8..000000000000
--- a/media-video/noad/noad-0.6.0-r6.ebuild
+++ /dev/null
@@ -1,87 +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-r6.ebuild,v 1.5 2007/01/05 17:18:22 hd_brummy 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="x86 ~amd64"
-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}/${P}-directoryfix.diff
-	epatch ${FILESDIR}/${P}-as-needed.diff
-	epatch ${FILESDIR}/${P}-cflags.diff
-	epatch ${FILESDIR}/${P}-framesize.diff
-	epatch ${FILESDIR}/${P}-delete-while-scanning.diff
-	epatch ${FILESDIR}/${P}-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 COPYING README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	CONF_SOURCE=${FILESDIR}/0.6.0-r5
-	insinto /etc/conf.d
-	newins ${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-r7.ebuild b/media-video/noad/noad-0.6.0-r7.ebuild
index 953c88fb96f6..26aecd21e66b 100644
--- a/media-video/noad/noad-0.6.0-r7.ebuild
+++ b/media-video/noad/noad-0.6.0-r7.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/01/05 17:18:22 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r7.ebuild,v 1.3 2007/02/07 10:55:31 zzam Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -14,7 +14,7 @@ SRC_URI="http://www.freepgs.com/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE="ffmpeg imagemagick"
 
 DEPEND="media-libs/libmpeg2