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

(Portage version: 2.1.9.25/cvs/Linux i686)

3 files changed, 12 insertions, 86 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/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."
-}