clean up

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)

3 files changed, 7 insertions, 73 deletions

diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog
index fb40d514ae9c..c2b0d99b4119 100644
--- a/media-plugins/vdr-audiorecorder/ChangeLog
+++ b/media-plugins/vdr-audiorecorder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-audiorecorder
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.17 2013/06/17 19:46:02 scarabeus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.18 2014/01/08 11:47:06 hd_brummy Exp $
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-audiorecorder-0.1.0_pre14-r1.ebuild,
+  -files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff:
+  clean up
 
   17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/vdr-audiorecorder-0.1.0_pre14-libav9.patch,
diff --git a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff
deleted file mode 100644
index 96523b1f5024..000000000000
--- a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=423671
-fixed compile newer ffmepg
-
-signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/07/01)
-diff -Naur audiorecorder-0.1.0-pre14.orig/convert.c audiorecorder-0.1.0-pre14/convert.c
---- audiorecorder-0.1.0-pre14.orig/convert.c	2012-07-01 11:38:56.000000000 +0200
-+++ audiorecorder-0.1.0-pre14/convert.c	2012-07-01 11:41:12.000000000 +0200
-@@ -111,9 +111,13 @@
-         avcodec_decode_audio(decoder_ctx, (short *)decoder_buf.data,
-                 &decoder_buf.length, mpa_frame->data, mpa_frame->length);
- #else
-+        AVPacket avpkt;
-+        av_init_packet(&avpkt);
-+        avpkt.data = mpa_frame->data;
-+        avpkt.size = mpa_frame->length;
-         decoder_buf.length = AVCODEC_MAX_AUDIO_FRAME_SIZE;
--        avcodec_decode_audio2(decoder_ctx, (short *)decoder_buf.data,
--                &decoder_buf.length, mpa_frame->data, mpa_frame->length);
-+        int len = avcodec_decode_audio3(decoder_ctx, (short *)decoder_buf.data,
-+                &decoder_buf.length, &avpkt);
- #endif
- }
- 
diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild
deleted file mode 100644
index 1f8f816368af..000000000000
--- a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r1.ebuild,v 1.2 2011/04/03 19:13:12 scarabeus Exp $
-
-EAPI=3
-
-inherit vdr-plugin flag-o-matic
-
-MY_P=${P/_pre/-pre}
-
-DESCRIPTION="VDR plugin: automatically record radio-channels and split it into tracks according to RadioText-Info"
-HOMEPAGE="http://www.a-land.de/audiorecorder/"
-SRC_URI="http://www.zulu-entertainment.de/files/${PN}/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-DEPEND=">=media-video/vdr-1.6.0
-		media-libs/taglib
-		virtual/ffmpeg[encode,mp3]
-		>=dev-libs/tinyxml-2.6.1[stl]"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	epatch "${FILESDIR}/${P}-shared-tinyxml.diff"
-
-	sed -i "s:include <avcodec.h>:include <libavcodec/avcodec.h>:" convert.h audiorecorder.c
-	sed -i "s:RegisterI18n:// RegisterI18n:" audiorecorder.c
-
-	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
-	vdr-plugin_src_install
-	keepdir /var/vdr/audiorecorder
-	chown -R vdr:vdr "${D}"/var/vdr
-
-	insinto /etc/vdr/plugins/audiorecorder
-	doins "${S}"/contrib/audiorecorder.conf
-}