Stabilise latest on amd64 and x86. Drop older.

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

24 files changed, 58 insertions, 741 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index bb0f4b48d312..d62abd060059 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-video/noad
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.50 2011/12/28 21:38:26 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.51 2012/05/16 09:33:49 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0.6.0-r7/confd_vdraddon.noad, -noad-0.6.0-r9.ebuild,
+  -files/0.6.0-r7/noad-reccmd, -files/patches-0.6.0/as-needed.diff,
+  -files/0.6.0-r7/reccmds.noad.conf, -files/patches-0.6.0/cflags.diff,
+  -files/0.7.1/confd_vdraddon.noad,
+  -files/patches-0.6.0/delete-while-scanning.diff,
+  -files/patches-0.6.0/directoryfix.diff, -files/patches-0.6.0/fix-osd.patch,
+  -files/patches-0.6.0/framesize.diff, -files/patches-0.6.0/hangcheck.diff,
+  -files/patches-0.6.0/lavc.patch,
+  -files/patches-0.6.0/new-ffmpeg-extern-c.diff, -files/patches-0.6.0/series,
+  -noad-0.7.2-r2.ebuild, noad-0.7.3.ebuild, -files/0.6.0-r7/record-50-noad.sh,
+  -files/0.7.1/noad-reccmd, -files/0.7.1/reccmds.noad.conf,
+  -files/0.7.1/record-50-noad.sh:
+  Stabilise latest on amd64 and x86. Drop older.
 
 *noad-0.7.3 (28 Dec 2011)
 
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index ff5edd9ca309..98d7c51be57e 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -1,41 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.6.0-r7/confd_vdraddon.noad 1443 RMD160 aa1dd8349139cb1aebfb06a759e57370ca6bf1e8 SHA1 5b2d15efa42a366b89a6ab6271f94618cad3c194 SHA256 6a1728d5b27f7964d0032f1f522f7057d8a5ebd8d6b542ad85fb4fc924b2308d
-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 1479 RMD160 e75ab97dca1c5d9ddbd354dea663381e2b4b34cb SHA1 8610543619dbefc759050225a2d9c5218b706337 SHA256 ce00ad9670920d8287dc68a964ed30e4a99c48f9188dc239f9ce4eb067abc907
-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 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
-AUX patches-0.6.0/directoryfix.diff 1254 RMD160 f7ed26ef2478d7a3a622e288642615b8da46318b SHA1 c129f0c23708fed6e6921c912c426c38ad0c676a SHA256 edbadaaafcb6677b73cc368062e21dd81c81d35709cd55bd87a759068d5804ed
-AUX patches-0.6.0/fix-osd.patch 786 RMD160 e6385da0b44bf077c50612a7fee234e9ffba338a SHA1 85bd9023eeb5626c837bc85583cc98b80691400c SHA256 94af6480d5bef48ab7a597facded3c24e3ef68e62a2fa946ef412281f0a4f173
-AUX patches-0.6.0/framesize.diff 414 RMD160 187c4be6c276f878b3e64ad484ee6cb19d7dc3ad SHA1 93da45091c53e88f51090421aaa5b7e9fddf4eb7 SHA256 f6b7769ef62f5c00de9acb9d5e20fba09c2f745dfb2872405b6780411452eb9f
-AUX patches-0.6.0/hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
-AUX patches-0.6.0/lavc.patch 524 RMD160 ba56259bec165aa79bcb5a9b94c8bd5eb5d97d4d SHA1 0583ba0c6dbc7a7fd014af68376ab7eabf49a609 SHA256 bc544218c4894eba6f48b90ea5df12f86fdb38330d93d4d2e0ac305f71a0d5c4
-AUX patches-0.6.0/new-ffmpeg-extern-c.diff 316 RMD160 c90e734ef1b105833a13e1dbd6ea85ece333c4b0 SHA1 10854a6893cb3388876a46e9179140790d051c6e SHA256 bc69d37f89aa5415953dca8480d47db4e34ec4996ef279649c0d7e10c6b3f55e
-AUX patches-0.6.0/series 126 RMD160 8b73b009a02477de8bf24980cab7260036a84c34 SHA1 bf359b445135235a38d5bcd39c7e38a80c542902 SHA256 a74330aed7d138edccfc1477626d830f21844fdd4b7929a5cae6176722f2b60a
 AUX patches-0.7.x/noad-0.7.2-cflags.patch 504 RMD160 1687a8e9ea8809f40580b82d26813889d8fe3b12 SHA1 686d438e68753ea45a4d30b8dfe3aea872d2fc26 SHA256 b0ac44bc934c79d8198e16eca784889082818e6470191fad13a137ab9fd138c6
 AUX patches-0.7.x/noad-0.7.2-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
 AUX patches-0.7.x/noad-0.7.3-hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
 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.2.tar.bz2 175293 RMD160 c4ab24407a695d1831fd205be0f36ad23ef711e2 SHA1 cdf3acd0b0a31a56a39edda5025e8c2848370c44 SHA256 5ee00ecaabfe4d9e5c8e6de028a661121f681b59f5cb4387853e5010c194e08f
 DIST noad-0.7.3.tar.bz2 174036 RMD160 a5b4b9ec272b0662c896a32ffbbbb74da088d33c SHA1 317de559d0fb784c70070760c41f06ec6fbcc122 SHA256 6fb597fb0ae0e4c4c954f2feb89dcc88c4852a0f0845aa214606996abb29f6cb
-EBUILD noad-0.6.0-r9.ebuild 2548 RMD160 4eea5c7d4c08e3f187d2369850f85328cb66418a SHA1 6d97bf6739b17513cbc9a314abb3796e3c13bbe6 SHA256 1994cd3bfa502c559ffd3dfda5c7cd533daef9851e98124ab7e1ae0f410a099f
-EBUILD noad-0.7.2-r2.ebuild 2186 RMD160 72addc157f54017127e98043b73d3fa56b103837 SHA1 7e4af56c30a59ebc05597bec1bf20b875be042d1 SHA256 7ef056edf0ee9d52ba2153b79da7fc7180e773597e74959cc088832e99029df1
-EBUILD noad-0.7.3.ebuild 2131 RMD160 491596548f21a9d550edf5972802cbdfb8a6916b SHA1 86d8f2583b167a6a02696bcad26b0d88564a95ea SHA256 57ef0fe60bf2489e08ece6022ddec297035a9cc666924f38da5444650e0fa2ec
-MISC ChangeLog 10451 RMD160 9e0c503b62632e1decfa8b7bd7c751598a29c9b6 SHA1 2a3b8c554919b5456f8c0b95c751fe58775a1971 SHA256 68901ba9ceb0bc89181a2173dca3e8a5c0214dadd560ed589c608a987a5ca5bf
+EBUILD noad-0.7.3.ebuild 2129 RMD160 535fc38cc2caa52c1aaad6b04b8374443f867e18 SHA1 ae95cf4af83981e007d5b193335215a43b6d6070 SHA256 2ef55926eae479fe5a0bf8ffc1f8078ec0abfb39ae0206fa58e39101b50a81d0
+MISC ChangeLog 11284 RMD160 d08fe1194f27d915a370defe9df7e02d1d7b0254 SHA1 00caaec66d765a1c8f93c1a0a7b30b7d767c7320 SHA256 7eeb964318f53782501cf125df8b888b27a0ac92c0469276ef9ebe5c5937eb98
 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
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFO+4xcdn07HTTCgIoRAtQlAKCnO9V2TZzOwvvKTPhMItOXlGBbHwCfVFPv
-IFtQ8zC2KQDjVGGRZ8EFWjg=
-=F1V/
+iQIcBAEBAgAGBQJPs3SLAAoJEOSiRoyO7jvo96EP/1jRPrdV51vbYAX2tVia4Kor
+LHcgLDJf9HTU/QU3PcxBuk5ZubJX/IrpzFAXJuskK09XExNqg0um/1EB9epYT351
+PgNeK1X0T82VUAooh5LrTksQSdxM4JuqzyxHTo5xTeqEkhAN4v4dmu/d0Pv2O7FJ
+fi/UvOrRvhKhsmBZFHodGw+Hn4DDuw+cnxjRnorOW1JCRj0FhXj2GLnfDn6UEhUQ
+dTVLfkeUSjom0ApaUIzJeE6FxEoNdiGxpjXn4tE/5xeqARrs36A4TloS34wnN2Jh
+kf9hezQ2BKKCMF+zJsBgz7lsswvd2AgVgKfjWmo9hPbUdGeooUro71R0Tep5bi6X
+NVmYfcTAfHU8LYYXUqgZW2BEU5PFWUhN+f/oLIZR9s7opbylS7VR2rF2uxSY7/14
+w7FovrB1tbfV166Sz5kPVrYA5xrqc6kAqoaIdSBQ4Tt06WRr7U9MZNyb5WoKUW7t
+Z2Lk3EjijLcZFLlafIRcVYzZl8myt0+o5cVIQCWLmeYNnDnAo31oY7waDr9xO0B6
+yRkUSX0tqVx8/Mgo73y15ryjwnjomnVUSsofy5Ius4w5okUYFxrz3TDTQk4jIQXk
+CPLKj5WHM4SlWoke5k9/V2fFrGcLv9WD0Sv0xPFZxby6iVaCRzkMTmf+9hDeMQxh
+l//6Zl8hWSpCUk53zvid
+=2QH5
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad b/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad
deleted file mode 100644
index b5e44f76c8ba..000000000000
--- a/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad
+++ /dev/null
@@ -1,71 +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-r7/confd_vdraddon.noad,v 1.2 2006/12/28 21:00:47 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 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.6.0-r7/noad-reccmd b/media-video/noad/files/0.6.0-r7/noad-reccmd
deleted file mode 100644
index 3979baa574f9..000000000000
--- a/media-video/noad/files/0.6.0-r7/noad-reccmd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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.6.0-r7/reccmds.noad.conf b/media-video/noad/files/0.6.0-r7/reccmds.noad.conf
deleted file mode 100644
index 5d35495a90b8..000000000000
--- a/media-video/noad/files/0.6.0-r7/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-r7/record-50-noad.sh b/media-video/noad/files/0.6.0-r7/record-50-noad.sh
deleted file mode 100644
index f4784bc07d16..000000000000
--- a/media-video/noad/files/0.6.0-r7/record-50-noad.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r7/record-50-noad.sh,v 1.5 2007/06/12 16:04:19 zzam 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/files/0.7.1/confd_vdraddon.noad b/media-video/noad/files/0.7.1/confd_vdraddon.noad
deleted file mode 100644
index eae61b501b20..000000000000
--- a/media-video/noad/files/0.7.1/confd_vdraddon.noad
+++ /dev/null
@@ -1,72 +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.7.1/confd_vdraddon.noad,v 1.2 2010/09/05 17:43:18 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/0.7.1/noad-reccmd b/media-video/noad/files/0.7.1/noad-reccmd
deleted file mode 100644
index 3979baa574f9..000000000000
--- a/media-video/noad/files/0.7.1/noad-reccmd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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
deleted file mode 100644
index 5d35495a90b8..000000000000
--- a/media-video/noad/files/0.7.1/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.7.1/record-50-noad.sh b/media-video/noad/files/0.7.1/record-50-noad.sh
deleted file mode 100644
index 57f32a53e8ed..000000000000
--- a/media-video/noad/files/0.7.1/record-50-noad.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-# $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>
-#
-
-. /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/files/patches-0.6.0/as-needed.diff b/media-video/noad/files/patches-0.6.0/as-needed.diff
deleted file mode 100644
index a1a38638aed4..000000000000
--- a/media-video/noad/files/patches-0.6.0/as-needed.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru noad-0.6.0-orig/Makefile.am noad-0.6.0/Makefile.am
---- noad-0.6.0-orig/Makefile.am	2006-06-19 09:40:49.000000000 +0200
-+++ noad-0.6.0/Makefile.am	2006-06-19 09:41:47.000000000 +0200
-@@ -4,8 +4,8 @@
- libnoad_a_SOURCES=tools.cpp vdr_cl.cpp svdrpc.cpp tools.h vdr_cl.h svdrpc.h mpeg2wrap.cpp mpeg2wrap.h
- 
- bin_PROGRAMS=noad
--noad_SOURCES=cchecklogo.cpp ccontrol.cpp cgetlogo.cpp ctoolbox.cpp noad.cpp tnoad.cpp noaddata.cpp\
--	           audiotools.cpp main.cpp \
-+noad_SOURCES=main.cpp cchecklogo.cpp ccontrol.cpp cgetlogo.cpp ctoolbox.cpp noad.cpp tnoad.cpp noaddata.cpp\
-+	           audiotools.cpp \
- 	    	audiotools.h cchecklogo.h ccontrol.h cgetlogo.h ctoolbox.h noad.h tnoad.h noaddata.h videodir.h
- 
- noad_LDADD=libnoad.a
-@@ -14,8 +14,7 @@
- EXTRA_PROGRAMS=markpics showindex
- 
- markpics_SOURCES=markpics.cpp
--markpics_LDADD=libnoad.a
--markpics_LDFLAGS=-lMagick++
-+markpics_LDADD=libnoad.a -lMagick++
- 
- showindex_SOURCES=showindex.cpp
- showindex_LDADD=libnoad.a
diff --git a/media-video/noad/files/patches-0.6.0/cflags.diff b/media-video/noad/files/patches-0.6.0/cflags.diff
deleted file mode 100644
index bb8985ba4e18..000000000000
--- a/media-video/noad/files/patches-0.6.0/cflags.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru noad-0.6.0-orig/configure.ac noad-0.6.0/configure.ac
---- noad-0.6.0-orig/configure.ac	2006-06-19 09:35:21.005806971 +0200
-+++ noad-0.6.0/configure.ac	2006-06-19 09:37:45.574799434 +0200
-@@ -122,16 +122,15 @@
- 
- AC_SUBST(PICSRC,"")
- AC_MSG_CHECKING(for Magick++(2))
--CFLAGS=$ac_save_CFLAGS
--ac_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS -lMagick++"
-+save_LDADD="$LDADD"
-+LDADD="$LDADD -lMagick++"
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([#include <Magick++.h>
- using namespace Magick;
- ],[Image image;])
- ],[AC_MSG_RESULT("yes");mpp_defined="1"],[AC_MSG_RESULT("no");mpp_defined="0"]
- )
--CXXFLAGS=$ac_save_CXXFLAGS
-+LDADD=$save_LDADD
- test $mpp_defined -eq 1 && test $havemagick -eq 1 && PICSRC="markpics"
- 
- dnl check for request to compile toolies
-@@ -170,7 +169,7 @@
- AC_CHECK_FUNCS([gettimeofday localtime_r memmove memset mkdir select socket strchr strdup strerror strrchr strstr])
- AC_CHECK_FUNCS([strsignal])
- #CXXFLAGS='-g -O3 -pg'
--CXXFLAGS='-g -O3'
-+#CXXFLAGS='-g -O3'
- 
- if test "$withffmpeg" == "1"; then 
-   dnl check for a usable avcodec.h 
diff --git a/media-video/noad/files/patches-0.6.0/delete-while-scanning.diff b/media-video/noad/files/patches-0.6.0/delete-while-scanning.diff
deleted file mode 100644
index 0de5a8f2c929..000000000000
--- a/media-video/noad/files/patches-0.6.0/delete-while-scanning.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru noad-0.6.0-orig/tools.cpp noad-0.6.0/tools.cpp
---- noad-0.6.0-orig/tools.cpp	2006-09-22 14:33:32.000000000 +0200
-+++ noad-0.6.0/tools.cpp	2006-10-06 10:09:35.000000000 +0200
-@@ -17,6 +17,8 @@
- #include <time.h>
- #include <unistd.h>
- #include <execinfo.h>
-+#include <sys/types.h>
-+#include <signal.h>
- 
- extern int SysLogLevel;
- 
-@@ -961,6 +963,10 @@
-     esyslog(LOG_ERR, "ERROR: frame larger than buffer (%d > %d)", Length, Max);
-     Length = Max;
-   }
-+  if (f == -1) {
-+    esyslog(LOG_ERR, "ERROR: cannot open video-file (recording deleted while scanning or bad index-file)");
-+    kill(getpid(),SIGTERM);
-+  }
-   //int r = safe_read(f, b, Length);
-   int r = read( f,b,Length);
-   if (r < 0)
diff --git a/media-video/noad/files/patches-0.6.0/directoryfix.diff b/media-video/noad/files/patches-0.6.0/directoryfix.diff
deleted file mode 100644
index 23e94e858618..000000000000
--- a/media-video/noad/files/patches-0.6.0/directoryfix.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-taken from http://vdr-portal.de/board/thread.php?threadid=38968
-
-diff -Nur noad.old/svdrpc.cpp noad.new/svdrpc.cpp
---- noad.old/svdrpc.cpp	2005-02-12 18:32:10.000000000 +0100
-+++ noad.new/svdrpc.cpp	2005-09-13 12:52:08.000000000 +0200
-@@ -250,13 +250,30 @@
- {
-   char *baseName = NULL;
-   char *cp = NULL;
--  char *vend = strchr(filename,'/');
--  if( vend )
-+  char *fname = NULL;
-+  char *vend = NULL;
-+  
-+  asprintf(&fname, "%s", filename);
-+  if(fname[strlen(fname) - 1] == '/')
-+    fname[strlen(fname) - 1] = '\0';
-+  vend = strrchr(fname,'/');
-+  if(vend) {
-+    *vend = '\0';
-+    vend = strrchr(fname,'/');
-+  }
-+  
-+  if( vend && vend[1] == '_')
-+  {
-+    *vend = '\0';
-+    vend = strrchr(fname,'/');
-+  }
-+
-+  if( vend && strchr(vend+1, '/'))
-     vend = strchr(vend+1,'/');
-   if( vend )
--    asprintf(&baseName,"mesg %s %s",msg,vend+1);
-+    asprintf(&baseName,"mesg %s '%s'",msg,vend+1);
-   else
--    asprintf(&baseName,"mesg %s %s",msg, filename);
-+    asprintf(&baseName,"mesg %s '%s'",msg, filename);
-   if( baseName[strlen(baseName)-1] == '/' )
-     baseName[strlen(baseName)-1] = '\0';
-   vend = strrchr(baseName, '/');
-@@ -268,6 +285,7 @@
- 
-   free(baseName);
-   free(cp);
-+  free(fname);
- }
- 
- void noadStartMessage( const char *s)
diff --git a/media-video/noad/files/patches-0.6.0/fix-osd.patch b/media-video/noad/files/patches-0.6.0/fix-osd.patch
deleted file mode 100644
index d25eb0064e00..000000000000
--- a/media-video/noad/files/patches-0.6.0/fix-osd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://www.e-tobi.net/cgi-bin/viewcvs.cgi/vdr-addon-noad/trunk/debian/patches/10_fix-osd.dpatch?rev=1946&root=vdr+subversion+repository&view=auto
-
-Fixes problems with "noad --OSD" if vdr is not running.
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 16 Oct 2006
-
---- old/svdrpc.cpp	Tue Jun 22 00:41:57 2004
-+++ new/svdrpc.cpp	Sat Dec 18 19:54:44 2004
-@@ -189,6 +189,10 @@
-     {
-       select(1, &set, NULL, NULL, &timeout);
-       n = read(filedes, buf + rbytes, 1);
-+      if(n<0) {
-+        filedes=-1;
-+        break;
-+      }
-       rbytes += n;
-       if (rbytes == size)
-          break;
-@@ -214,7 +218,8 @@
-   while( i < 100 && outstandingReply > 0 )
-   {
-     usleep(10000);
--    ReadReply();
-+    if( !ReadReply() )
-+      break;
-     i++;
-   }
-   return( outstandingReply <= 0 );
-
diff --git a/media-video/noad/files/patches-0.6.0/framesize.diff b/media-video/noad/files/patches-0.6.0/framesize.diff
deleted file mode 100644
index 9f0e9d01d3e6..000000000000
--- a/media-video/noad/files/patches-0.6.0/framesize.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru noad-0.6.0-orig/vdr_cl.h noad-0.6.0/vdr_cl.h
---- noad-0.6.0-orig/vdr_cl.h	2006-10-07 11:25:46.164645112 +0200
-+++ noad-0.6.0/vdr_cl.h	2006-10-07 11:26:01.022074938 +0200
-@@ -52,7 +52,7 @@
- 
- #define KILOBYTE(n) ((n) * 1024)
- // The maximum size of a single frame:
--#define MAXFRAMESIZE  KILOBYTE(192)
-+#define MAXFRAMESIZE  KILOBYTE(256)
- 
- #define FRAMESPERSEC 25
- #define FRAMESPERMIN (FRAMESPERSEC*60)
diff --git a/media-video/noad/files/patches-0.6.0/hangcheck.diff b/media-video/noad/files/patches-0.6.0/hangcheck.diff
deleted file mode 100644
index 37788a197fd7..000000000000
--- a/media-video/noad/files/patches-0.6.0/hangcheck.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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.6.0/lavc.patch b/media-video/noad/files/patches-0.6.0/lavc.patch
deleted file mode 100644
index 3139a78d308e..000000000000
--- a/media-video/noad/files/patches-0.6.0/lavc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: noad-0.6.0/audiotools.cpp
-===================================================================
---- noad-0.6.0.orig/audiotools.cpp
-+++ noad-0.6.0/audiotools.cpp
-@@ -99,7 +99,8 @@ int scan_audio_stream_0(unsigned char *m
-   inbuf_ptr = mbuf;
-   while (size > 0) 
-   {
--    len = avcodec_decode_audio(c, (short *)outbuf, &out_size, 
-+    out_size=AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+    len = avcodec_decode_audio2(c, (short *)outbuf, &out_size, 
-                                   inbuf_ptr, size);
-     if (len < 0) 
-     {
diff --git a/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff b/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff
deleted file mode 100644
index 5726cab796c3..000000000000
--- a/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: noad-0.6.0/audiotools.cpp
-===================================================================
---- noad-0.6.0.orig/audiotools.cpp
-+++ noad-0.6.0/audiotools.cpp
-@@ -3,7 +3,9 @@
- #ifdef HAVE_LIBAVCODEC
- 
- #include "mpeg2wrap.h"
-+extern "C" {
- #include "avcodec.h"
-+}
- 
- #define MIN_LOWVALS 3
- #define CUT_VAL 10
diff --git a/media-video/noad/files/patches-0.6.0/series b/media-video/noad/files/patches-0.6.0/series
deleted file mode 100644
index 67c440e7bf58..000000000000
--- a/media-video/noad/files/patches-0.6.0/series
+++ /dev/null
@@ -1,7 +0,0 @@
-directoryfix.diff
-as-needed.diff
-cflags.diff
-framesize.diff
-delete-while-scanning.diff
-fix-osd.patch
-new-ffmpeg-extern-c.diff
diff --git a/media-video/noad/noad-0.6.0-r9.ebuild b/media-video/noad/noad-0.6.0-r9.ebuild
deleted file mode 100644
index 544a0faa3c22..000000000000
--- a/media-video/noad/noad-0.6.0-r9.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 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-r9.ebuild,v 1.10 2011/04/06 17:33:09 idl0r Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Mark commercial Breaks in VDR records"
-HOMEPAGE="http://noad.heliohost.org/"
-SRC_URI="http://noad.heliohost.org/oldv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ffmpeg imagemagick"
-
-DEPEND="media-libs/libmpeg2
-	ffmpeg? ( >=virtual/ffmpeg-0.4.8 )
-	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )"
-RDEPEND="${DEPEND}"
-
-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
-	epatch "${FILESDIR}"/patches-${PV}/new-ffmpeg-extern-c.diff
-	epatch "${FILESDIR}"/patches-${PV}/lavc.patch
-
-	sed -e "s:char \*indents:const char \*indents:" -i showindex.cpp
-
-	if has_version ">=virtual/ffmpeg-0.4.9_p20080326" ; then
-		sed -e "s:include/ffmpeg:include/libavcodec:g" -i configure.ac
-	fi
-
-	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 /usr/share/vdr/shutdown
-	doins "${FILESDIR}"/pre-shutdown-15-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.2-r2.ebuild b/media-video/noad/noad-0.7.2-r2.ebuild
deleted file mode 100644
index 17e369053aa6..000000000000
--- a/media-video/noad/noad-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.2-r2.ebuild,v 1.2 2011/04/06 17:33:09 idl0r Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-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? ( >=virtual/ffmpeg-0.4.8 )
-	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )
-	!media-plugins/vdr-markad"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-
-	epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff
-	epatch "${FILESDIR}"/patches-0.7.x/"${P}"-cflags.patch
-	eautoreconf
-	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
-
-	if has_version ">=media-video/vdr-1.7.15"; then
-		sed -e "s:2001:6419:" -i svdrpc.cpp
-	fi
-}
-
-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
-
-	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."
-}
diff --git a/media-video/noad/noad-0.7.3.ebuild b/media-video/noad/noad-0.7.3.ebuild
index 9e497acb6349..745b2dbe9b9c 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-2011 Gentoo Foundation
+# 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.1 2011/12/28 21:38:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3.ebuild,v 1.2 2012/05/16 09:33:49 scarabeus Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://noad.heliohost.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ffmpeg imagemagick"
 
 DEPEND="media-libs/libmpeg2
diff --git a/media-video/qx11grab/Manifest b/media-video/qx11grab/Manifest
index 3b9e55cca050..ded2f4f6a981 100644
--- a/media-video/qx11grab/Manifest
+++ b/media-video/qx11grab/Manifest
@@ -1,11 +1,25 @@
-AUX 0.4.1-detect-avconv-presets-dir.patch 867 RMD160 1e5cfd4e9611f7a3ebf991e819ae24cf6eba9149 SHA1 8a47a81125cc8f30b4013ff10cb9c47dcb1553d8 SHA256 195d003242961204c6cdc57026b9b1328b0876b4d4bc980aacb22b5a16ce59a3
-AUX 0.4.1-fix-install-destination.patch 865 RMD160 74b58da2b342d1fd07609690a71b335b952dafb6 SHA1 0223a10599875d2fa05a2f2f467e3d7f659ba433 SHA256 61b912f5f3d84b360449f8c0b4f3dae16e28546d1dbb7886416a0c884b1e378a
-AUX 0.4.1-fix-typos-in-CMakeLists.patch 907 RMD160 9b9175cf1f6cdc30d792a7a618a7abe69132ea97 SHA1 13a7fdd719b506660750796e13c4140b831092a6 SHA256 1e425b839ac238524926afc49783314bea436a758033001206e2c80a5c929fa2
-AUX 0.4.1-optional-pulseaudio.patch 1276 RMD160 fd173c469cd72123dd584eaa32e36067f588baf0 SHA1 c1acc33d21a79e5d924dfb95b1965fadbcbb8213 SHA256 9cbdc0c0a337edae89ae87c9f281ce76f0090635e714313c95d997db8f7bad40
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.4.3-fix-ffmpeg-filter-check.patch 1327 RMD160 49bfc73857dee36d0eb22ad3daa3f8668d221ad3 SHA1 28b92abea03be5ac8757dbcc5f7047275784a173 SHA256 ed7a5250c172306043b3e0d2c6c6b9d78bf7003248d9f72e63e4a6382934d758
-DIST qx11grab-0.4.1.tar.xz 337792 RMD160 59b8efacd25c5991e277aabc4c9cee85d5d62658 SHA1 bba5c503c9410261cfdebb428d9ad8eeb9535a16 SHA256 8873d7e9ebf434d13bf81f4f155801a774251f04199a2ff149ad3c36d7afc7d1
 DIST qx11grab-0.4.3.tar.xz 361016 RMD160 dc780a5262357f99b34a7f94f24670c042201971 SHA1 c1b256519f48cdbab58a431d662713316fa907e7 SHA256 39c556ac5a45521677345d0fc30ad821999dae623ff5fc535c1336b1adc199dd
-EBUILD qx11grab-0.4.1-r2.ebuild 1480 RMD160 8472cce9276bd56a51cd7e7a0c8d97ef207f1c8a SHA1 62d219cf4d0b813f5911b3e48302c8558032a44d SHA256 65b9cfd961236b36e335785b08c4349e20e000989f28cfa34f1138088dde6936
-EBUILD qx11grab-0.4.3.ebuild 1447 RMD160 e04c2c028a85ba80c0ddc3ae6be978f14e9b93c7 SHA1 b4298beea6c7ba513d5b9503623f1c4869c48ff2 SHA256 fe0dcdf3fb4271121e6122189f367d660f77b98e8781ddae1fd6b123226f3d87
-MISC ChangeLog 4455 RMD160 32f5cf31dc069dfa8c7e56588f8403cd950a2ccb SHA1 147ac1e70231d9c46c6ae13e885883b2007b1c2c SHA256 6b11bd1e9ec4469ad2dee7acb9b7abe3f7fe34d60832b80e5293a37bd267864e
+EBUILD qx11grab-0.4.3.ebuild 1448 RMD160 e337f2d94860fb0abc5341740eca0778bfe7da44 SHA1 468f66730563f705acd41ed8aa039acdd1f4aa4a SHA256 451bc3f2d5225c8a2398768b14e0d7cd1d86c482132a0cee13cf51626662a2ee
+MISC ChangeLog 4794 RMD160 e10302c38bc439c4745ca10b76cdad0e427cdd78 SHA1 ad64c5e678f911117ae6af47e4c37241dd7efc17 SHA256 7eed8c010b4cb46c771807d9df13c811492860b835853b7b5c53e18375c298b6
 MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPs3VqAAoJEOSiRoyO7jvoiD8P/RJWBFwxvk0JeZ7CSwJ3cEOA
+WdYILzPKeVcpej1cqmsIQEDphy1BYpuDdLVPWZnin/Lgayze6CZKU5pBARdwdbQE
+k5yr++wEslHGO9PCD/2VDnK0/1znNH/AuNwFXVUyBhydutr6v1C84B7MYMX0z+fF
+WJcbKB+VDA+J9iAGnIxSK0WIqJrinU/aemqRVA+GXZZj09ZcvOrQIkB1gmcfe1V8
+g7fEy7B8UcmCJeicuNv1s2Z7bmwLQePwWpMC1n0F5I7ngVZBhnExsY4XLLouR9Kq
+eVCau7IlYjjN2t4idZO9V1RiBPhwZZBoDLh4RZK/wRWLwRKOS5nEcKfPeDQsqVn7
+eig+KjR+AH4MuDExZUxMqNOyhRfLvTstY9XgId1K1ivF/3bXfagqLBxOLYXKN6wn
+4bBLDlBzvPbFPEjB4tWqjuxIILxF4Avj+qTM1QtWkerI6tGGbC2blNAKCf/DFwa7
+zTXWkZlK5q0vTYkD/llcfm1XqyuE4Cpd6lw3MykIi7IX22AQNXI2oNNMzNARXpzh
+ZapSDKZc1/h0s5/tr9E1ZaN+Y8pXnBwjv5OQe6f0ADzWfV0s7KWqP4ivMtbekwgl
+aatH0mEWcjN66ViVxAi+vYKF5+MbCQfZrmmeUuF18HeYnaD3clq7m7NuWU8aZP/P
+BzWqLAV0Eyvs5fJlEv9/
+=5OpP
+-----END PGP SIGNATURE-----