media-video/noad: cleanup old

this will also fix
media-video/noad : does not respect AR
in older ebuild versions

Closes: https://bugs.gentoo.org/469810
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>

10 files changed, 0 insertions, 438 deletions

diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 947101c403af..8722aadf4f8d 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -1,3 +1,2 @@
-DIST noad-0.7.3.tar.bz2 174036 BLAKE2B 11fbe9e794981b1666b04ff9d8909972a00db2daff90819d651324704836949af85278e807e7e6902b0198fd4dcd167c8722adcf816d95e15fe808efb93420a1 SHA512 0edc81c9b689c49b99cd68b80bf7acbb0af9757b4d5439edd0610ca96bf0ee4783844aa0dfe52e3303b21f5794af3ad9a216371d4e698bbf26f24bc31be43c66
 DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02
 DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff
deleted file mode 100644
index e757aeb884b0..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: noad-0.7.3/configure.ac
-===================================================================
---- noad-0.7.3.orig/configure.ac
-+++ noad-0.7.3/configure.ac
-@@ -158,7 +158,7 @@ dnl check that libavcodec is usable
- dnl ---------------------------------------------------------------------------
- if test "$withffmpeg" == "1"; then
-   AC_SUBST(LIBAVCODEC,"-lavcodec")
--  AC_CHECK_LIB([avcodec],[avcodec_init],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ])
-+  AC_CHECK_LIB([avcodec],[avcodec_register_all],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ])
- fi
- 
- 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff
deleted file mode 100644
index 37788a197fd7..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.3-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.7.x/noad-0.7.3_gcc-4.7.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff
deleted file mode 100644
index ca37f8e22a87..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=423623
-compilefix gcc-4.7.x
-
-signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/06/27)
-
-diff -Naur noad-0.7.3.orig/vdr_cl.h noad-0.7.3/vdr_cl.h
---- noad-0.7.3.orig/vdr_cl.h	2012-06-27 20:27:57.000000000 +0200
-+++ noad-0.7.3/vdr_cl.h	2012-06-27 20:30:56.000000000 +0200
-@@ -287,7 +287,7 @@
- 				{
- 					T *l = new T;
-                if (l->Parse(s))
--						Add(l);
-+						this->Add(l);
-                else 
- 					{
- 						esyslog("ERROR: error in %s, line %d", fileName, line);
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff
deleted file mode 100644
index c3c335c2663b..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Add missing includes for ressource limits.
-
-Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
-
---- main.cpp
-+++ main.cpp
-@@ -22,6 +22,7 @@
- 
- #include <stdlib.h>
- #include <time.h>
-+#include <sys/resource.h>
- #include <sys/wait.h>
- #include <signal.h>
- #include <execinfo.h>
diff --git a/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch b/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch
deleted file mode 100644
index 455252a74c8a..000000000000
--- a/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: noad-0.8.6/ffmpeg_decoder.cpp
-===================================================================
---- noad-0.8.6.orig/ffmpeg_decoder.cpp
-+++ noad-0.8.6/ffmpeg_decoder.cpp
-@@ -253,7 +253,11 @@ int FFMPegDecoder::decoder_exit()
- 	// close the file

- 	if( pFormatCtx )

- 	{

-+#if LIBAVFORMAT_VERSION_MAJOR < 54

- 		av_close_input_file(pFormatCtx);

-+#else

-+		avformat_close_input(&pFormatCtx);

-+#endif

- 		pFormatCtx = NULL;

- 	}

- 	// Close the codec

diff --git a/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff b/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff
deleted file mode 100644
index a9b6c89d9f8c..000000000000
--- a/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff
+++ /dev/null
@@ -1,106 +0,0 @@
-compile fix noad-0.8.6
-testet with libav-9 ffmpeg-2.2.9
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.o> (22 Oct 2014)
-diff -Naur noad-0.8.6.orig/audiotools.cpp noad-0.8.6/audiotools.cpp
---- noad-0.8.6.orig/audiotools.cpp	2014-10-22 14:26:57.809249955 +0200
-+++ noad-0.8.6/audiotools.cpp	2014-10-22 14:28:06.830249955 +0200
-@@ -50,9 +50,9 @@
- uint8_t *outbuf=NULL;
- AVCodec *codec=NULL;
- AVCodecContext *codecContext= NULL;
--#if LIBAVCODEC_VERSION_MAJOR > 54
-+//#if LIBAVCODEC_VERSION_MAJOR > 54
- AVDictionary *avDictionary = NULL;                // "create" an empty dictionary
--#endif
-+//#endif
- int64_t basepts=0;
- int64_t audiobasepts=0;
- //int64_t audiopts=0;
-@@ -108,13 +108,13 @@
-   codecContext = avcodec_alloc_context3(codec);
- #endif
- 
--#if LIBAVCODEC_VERSION_MAJOR > 54
-+//#if LIBAVCODEC_VERSION_MAJOR > 54
-    /* open it */
-    if (avcodec_open2(codecContext, codec, &avDictionary) < 0)
--#else
-+//#else
-   /* open it */
--  if (avcodec_open(codecContext, codec) < 0)
--#endif
-+//  if (avcodec_open(codecContext, codec) < 0)
-+//#endif
-   {
-     fprintf(stderr, "could not open codec\n");
-   }
-@@ -129,9 +129,9 @@
- {
-   free(outbuf);
-   avcodec_close(codecContext);
--#if LIBAVCODEC_VERSION_MAJOR > 54
-+//#if LIBAVCODEC_VERSION_MAJOR > 54
-   av_dict_free(&avDictionary);
--#endif
-+//#endif
-   av_free(codecContext);
-   av_codec_initialised = false;
- }
-diff -Naur noad-0.8.6.orig/ffmpeg_decoder.cpp noad-0.8.6/ffmpeg_decoder.cpp
---- noad-0.8.6.orig/ffmpeg_decoder.cpp	2014-10-22 14:26:57.808249955 +0200
-+++ noad-0.8.6/ffmpeg_decoder.cpp	2014-10-22 14:38:26.366249955 +0200
-@@ -184,7 +184,7 @@
- 

- 	// Retrieve stream information

- 	resetDecoder();

--   int openCode2 = av_find_stream_info(pFormatCtx);

-+   int openCode2 = avformat_find_stream_info(pFormatCtx, NULL);

- 	if(openCode2<0)

- 		return -1; // Couldn't find stream information

- 

-@@ -222,13 +222,13 @@
- 	if(pCodec->capabilities & CODEC_CAP_TRUNCATED)

- 		pCodecCtx->flags|=CODEC_FLAG_TRUNCATED;

- 

--#if LIBAVCODEC_VERSION_MAJOR > 54

-+//#if LIBAVCODEC_VERSION_MAJOR > 54

- 	// Open codec

- 	if(avcodec_open2(pCodecCtx, pCodec,&avDictionary) < 0)

--#else

-+//#else

- 	// Open codec

--	if(avcodec_open(pCodecCtx, pCodec)<0)

--#endif

-+//	if(avcodec_open(pCodecCtx, pCodec)<0)

-+//#endif

- 		return -1; // Could not open codec

- 

- 

-@@ -270,10 +270,10 @@
-       pIOContext = NULL;

- 	}

- #endif

--#if LIBAVCODEC_VERSION_MAJOR > 54

-+//#if LIBAVCODEC_VERSION_MAJOR > 54

-    av_dict_free(&avDictionary);

-    avDictionary = NULL;

--#endif

-+//#endif

- 	return 0;

- }

- 

-diff -Naur noad-0.8.6.orig/ffmpeg_decoder.h noad-0.8.6/ffmpeg_decoder.h
---- noad-0.8.6.orig/ffmpeg_decoder.h	2014-10-22 14:26:57.807249955 +0200
-+++ noad-0.8.6/ffmpeg_decoder.h	2014-10-22 14:36:27.213249955 +0200
-@@ -22,9 +22,9 @@
- 	int             i, videoStream;

- 	AVCodecContext  *pCodecCtx;

- 	AVCodec         *pCodec;

--#if LIBAVCODEC_VERSION_MAJOR > 54

-+//#if LIBAVCODEC_VERSION_MAJOR > 54

-    AVDictionary    *avDictionary;

--#endif

-+//#endif

- 	AVFrame         *pFrame;

- 

- public:

diff --git a/media-video/noad/noad-0.7.3-r1.ebuild b/media-video/noad/noad-0.7.3-r1.ebuild
deleted file mode 100644
index 3835c9d4b831..000000000000
--- a/media-video/noad/noad-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-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"
-
-RDEPEND="media-gfx/imagemagick
-	media-libs/libmpeg2:=
-	ffmpeg? ( virtual/ffmpeg )
-	!media-plugins/vdr-markad"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=diff EPATCH_SOURCE="${FILESDIR}"/patches-${PV%.*}.x epatch
-
-	if has_version '>=media-video/vdr-1.7.15'; then
-		sed -i -e 's:2001:6419:' -i svdrpc.cpp || die
-	fi
-
-	sed -i -e '/CXXFLAGS.*O3/d' configure.ac || die #426746
-
-	sed -i \
-		-e "s:-lMagick++:$($(tc-getPKG_CONFIG) --libs-only-l Magick++):" \
-		Makefile.am || die #467134
-
-	# FIXME: --with-tools, markpics will compile but showindex won't!
-	sed -i \
-		-e '/^noinst_PROGRAMS/s:@TOOLSRC@::' \
-		-e '/^EXTRA_PROGRAMS/s:showindex::' \
-		Makefile.am || die
-
-	# ld: audiotools.o: undefined reference to symbol 'av_free@@LIBAVUTIL_51'
-	if use ffmpeg; then
-		sed -i -e 's:-lavcodec:& -lavutil:' configure.ac || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-magick \
-		--with-mpeginclude=/usr/include/mpeg2dec \
-		--with-tools \
-		$(usex ffmpeg '--with-ffmpeg --with-ffmpeginclude=/usr/include' '')
-}
-
-src_install() {
-	dobin noad markpics # showindex
-
-	dodoc README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
-
-	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
-
-	insinto /usr/share/vdr/record
-	doins "${FILESDIR}"/record-50-noad.sh
-
-	insinto /usr/share/vdr/shutdown
-	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
-
-	insinto /etc/vdr/reccmds
-	doins "${FILESDIR}"/reccmds.noad.conf
-
-	exeinto /usr/share/vdr/bin
-	doexe "${FILESDIR}"/noad-reccmd
-}
-
-pkg_postinst() {
-	elog
-	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.8.6-r1.ebuild b/media-video/noad/noad-0.8.6-r1.ebuild
deleted file mode 100644
index 60d75aed517f..000000000000
--- a/media-video/noad/noad-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Mark commercial breaks in VDR recordings"
-HOMEPAGE="http://noad.net23.net/"
-SRC_URI="http://noad.net23.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+ffmpeg imagemagick libmpeg2"
-
-RDEPEND="
-	libmpeg2? ( media-libs/libmpeg2:= )
-	ffmpeg? ( virtual/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick )
-	!media-plugins/vdr-markad"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
-
-src_prepare() {
-	sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp
-
-	# tested libav-9, ffmepg-2.2.9
-	eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
-		"${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(usex imagemagick '--with-magick') \
-		$(usex ffmpeg '' '--without-ffmpeg') \
-		$(usex libmpeg2 '' '--without-libmpeg2') \
-		--with-tools
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"		# see bug #469810
-}
-
-src_install() {
-	dobin noad showindex checkMarks
-	use imagemagick && dobin markpics
-
-	dodoc README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd
-
-	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
-
-	insinto /usr/share/vdr/record
-	doins "${FILESDIR}"/record-50-noad.sh
-
-	insinto /usr/share/vdr/shutdown
-	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
-
-	insinto /etc/vdr/reccmds
-	doins "${FILESDIR}"/reccmds.noad.conf
-
-	exeinto /usr/share/vdr/bin
-	doexe "${FILESDIR}"/noad-reccmd
-}
-
-pkg_postinst() {
-	elog
-	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 parameters for noad,"
-	elog "please look in the documentation of noad."
-}
diff --git a/media-video/noad/noad-0.8.6-r2.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild
deleted file mode 100644
index d9c62f84e4be..000000000000
--- a/media-video/noad/noad-0.8.6-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Mark commercial breaks in VDR recordings"
-HOMEPAGE="http://noad.net23.net/"
-SRC_URI="http://noad.net23.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ffmpeg imagemagick libmpeg2"
-
-RDEPEND="
-	libmpeg2? ( media-libs/libmpeg2:= )
-	ffmpeg? ( virtual/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick )
-	!media-plugins/vdr-markad"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( ffmpeg libmpeg2 )"
-
-src_prepare() {
-	sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp
-
-	# wrt bug 575494
-	sed -e "s:CODEC_ID_MP3:AV_CODEC_ID_MP3:" -i audiotools.cpp
-	sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp
-
-	# tested libav-9, ffmepg-2.2.9
-	eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \
-		"${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(usex imagemagick '--with-magick') \
-		$(usex ffmpeg '' '--without-ffmpeg') \
-		$(usex libmpeg2 '' '--without-libmpeg2') \
-		--with-tools
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"		# see bug #469810
-}
-
-src_install() {
-	dobin noad showindex checkMarks
-	use imagemagick && dobin markpics
-
-	dodoc README INSTALL
-	# example scripts are installed as dokumentation
-	dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd
-
-	newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad
-
-	insinto /usr/share/vdr/record
-	doins "${FILESDIR}"/record-50-noad.sh
-
-	insinto /usr/share/vdr/shutdown
-	doins "${FILESDIR}"/pre-shutdown-15-noad.sh
-
-	insinto /etc/vdr/reccmds
-	doins "${FILESDIR}"/reccmds.noad.conf
-
-	exeinto /usr/share/vdr/bin
-	doexe "${FILESDIR}"/noad-reccmd
-}
-
-pkg_postinst() {
-	elog
-	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 parameters for noad,"
-	elog "please look in the documentation of noad."
-}