block media-plugins/vdr-markad, minor ebuild fixes

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

4 files changed, 17 insertions, 92 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 7c91d540b186..d67a32ab8bbf 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,10 @@
 # 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.45 2010/09/05 17:43:18 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.46 2011/01/25 23:10:29 hd_brummy Exp $
+
+  25 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org> -noad-0.7.2.ebuild,
+  noad-0.7.2-r1.ebuild:
+  block media-plugins/vdr-markad, minor ebuild fixes
 
 *noad-0.7.2-r1 (05 Sep 2010)
 
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 5efe57e3ef0d..65c1ccbe8cb2 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -25,15 +25,14 @@ AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741
 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
 EBUILD noad-0.6.0-r9.ebuild 2646 RMD160 c15910b990adca073f044eb7fafa1781b34aad86 SHA1 c2fffe220aa6fd590ee9b82e334ec6684a6745c2 SHA256 c2ba17500a4959f24147eb90e3d1f4d6c19b675265a87c5fb7607ae090d7fc91
-EBUILD noad-0.7.2-r1.ebuild 2147 RMD160 2a792085dd13ad8f53910aaef228ce506abc1098 SHA1 00268dcce5f4acb2ac8757b8d646fdafdbf0fee2 SHA256 20270a1b429902644f325641cac71915653eec67b98c43089b0973c905e18372
-EBUILD noad-0.7.2.ebuild 2051 RMD160 d943cd8244ef5bad0a2aebf198da7bcf9adef509 SHA1 e49004bfa0fc37231ad1e1cc3bdacc4205150840 SHA256 7c030f71cf398899f25d5a4f89bc4db2cc4bf3b5ca404f877d3f663956981f7b
-MISC ChangeLog 9584 RMD160 91dbfd79cb56ede7946c0fd2e9f82905e6109067 SHA1 40cfe4b0feaeb14118ac9099961535a40c6f840a SHA256 4ef0ea90ca8b8c4f352a45195f8717d0c7213201ff1b458193b6f022783b5ffa
+EBUILD noad-0.7.2-r1.ebuild 2194 RMD160 2e1dac1eff65fdc429888c18b23354fb17e2b156 SHA1 43ef3e9516ae3c40c1c9e7ec000316160188d35e SHA256 e8a77dacf4b20fd1f59b39f4670f954b028970f463e34722df14a994b205677c
+MISC ChangeLog 9737 RMD160 7d4ff2681422871b81d104b9e07e51dc15f7ae87 SHA1 cad8c9641004aabc14bef401715098283c0d1876 SHA256 5fe2580ededb14a4d1663f29172205e3bace6149bdefbd80c5afea0af7f7e84d
 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
 
-iD8DBQFMg9cQdn07HTTCgIoRAncaAJ9wAxMBCk3BqI/FD8/Xzf8CBENczgCcDRCa
-4dE9gdhAdMK/zylI6AZFyaQ=
-=A9yo
+iD8DBQFNP1iDdn07HTTCgIoRAg+EAJ4hta2NJhcXBE2sYyjBEAhdhN4tPwCcC4dC
+eL9Tc2Oy06RynfGTQQIcELE=
+=o9mO
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/noad-0.7.2-r1.ebuild b/media-video/noad/noad-0.7.2-r1.ebuild
index 164978365735..89eb45989750 100644
--- a/media-video/noad/noad-0.7.2-r1.ebuild
+++ b/media-video/noad/noad-0.7.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2010/09/05 17:43:18 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.2-r1.ebuild,v 1.2 2011/01/25 23:10:29 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
@@ -17,7 +17,9 @@ IUSE="ffmpeg imagemagick"
 
 DEPEND="media-libs/libmpeg2
 	ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
-	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )"
+	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )
+	!media-plugins/vdr-markad"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 
diff --git a/media-video/noad/noad-0.7.2.ebuild b/media-video/noad/noad-0.7.2.ebuild
deleted file mode 100644
index 36893ae2b920..000000000000
--- a/media-video/noad/noad-0.7.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.2.ebuild,v 1.2 2010/06/16 14:19:32 aballier Exp $
-
-EAPI="2"
-
-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? ( >=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
-	epatch "${FILESDIR}"/patches-0.7.x/"${P}"-cflags.patch
-	eautoreconf
-	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
-}
-
-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."
-}