cleanup; eapi=5

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

5 files changed, 11 insertions, 163 deletions

diff --git a/media-plugins/vdr-markad/ChangeLog b/media-plugins/vdr-markad/ChangeLog
index b43ced07e525..7f9255fd6a93 100644
--- a/media-plugins/vdr-markad/ChangeLog
+++ b/media-plugins/vdr-markad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-markad
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.12 2013/06/17 19:57:45 scarabeus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.13 2014/01/08 02:32:04 hd_brummy Exp $
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-markad-0.1.2.ebuild, -files/vdr-markad-0.1.2-ffmpeg.patch,
+  -vdr-markad-0.1.3.ebuild, vdr-markad-0.1.4.ebuild:
+  cleanup; eapi=5
 
   17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/vdr-markad-0.1.4-libav9.patch, vdr-markad-0.1.4.ebuild:
diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch
deleted file mode 100644
index 8934756ec99a..000000000000
--- a/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: markad-0.1.2/command/decoder.cpp
-===================================================================
---- markad-0.1.2.orig/command/decoder.cpp
-+++ markad-0.1.2/command/decoder.cpp
-@@ -163,7 +163,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
-             if (mp2_context)
-             {
-                 mp2_context->codec_id = mp2_codecid;
--                mp2_context->codec_type = CODEC_TYPE_AUDIO;
-+                mp2_context->codec_type = AVMEDIA_TYPE_AUDIO;
-                 if (avcodec_open(mp2_context, mp2_codec) < 0)
-                 {
-                     esyslog("could not open codec for MP2");
-@@ -198,7 +198,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
-             if (ac3_context)
-             {
-                 ac3_context->codec_id = ac3_codecid;
--                ac3_context->codec_type = CODEC_TYPE_AUDIO;
-+                ac3_context->codec_type = AVMEDIA_TYPE_AUDIO;
-                 if (avcodec_open(ac3_context, ac3_codec) < 0)
-                 {
-                     esyslog("could not open codec for AC3");
-@@ -265,7 +265,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
-                 video_context->skip_frame=AVDISCARD_NONKEY; // just I-frames
-             }
-             video_context->codec_id = video_codecid;
--            video_context->codec_type = CODEC_TYPE_VIDEO;
-+            video_context->codec_type = AVMEDIA_TYPE_VIDEO;
-             int ret=avcodec_open(video_context, video_codec);
-             if ((ret < 0) && (video_codecid==CODEC_ID_MPEG2VIDEO_XVMC))
-             {
-@@ -274,7 +274,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
-                 video_codec=avcodec_find_decoder(video_codecid);
-                 if (video_codec)
-                 {
--                    video_context->codec_type=CODEC_TYPE_UNKNOWN;
-+                    video_context->codec_type=AVMEDIA_TYPE_UNKNOWN;
-                     video_context->codec_id=CODEC_ID_NONE;
-                     video_context->codec_tag=0;
-                     memset(video_context->codec_name,0,sizeof(video_context->codec_name));
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild
deleted file mode 100644
index 4e45eefb2ee3..000000000000
--- a/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild,v 1.4 2012/03/02 17:18:35 hd_brummy Exp $
-
-EAPI="4"
-
-inherit vdr-plugin eutils
-
-VERSION="578" # every bump, new version
-
-DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-markad/"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6
-		virtual/ffmpeg[mp3,x264]
-		!media-video/noad"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${VDRPLUGIN}-${PV}/plugin"
-S2="${WORKDIR}/${VDRPLUGIN}-${PV}/command"
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	cd "${S2}"
-	sed -i Makefile \
-		-e "s:\$(CXXFLAGS) \$(OBJS):\$(CXXFLAGS) \$(LDFLAGS) \$(OBJS):"
-
-	if has_version ">=media-video/vdr-1.7.15"; then
-		sed -e "s:2001:6419:" -i markad-standalone.cpp
-	fi
-	epatch "${FILESDIR}/${P}-ffmpeg.patch"
-}
-
-src_compile() {
-	vdr-plugin_src_compile
-
-	cd "${S2}"
-	emake markad || die "Compiling command-line markad binary failed"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S2}"
-	dobin markad
-
-	insinto /var/lib/markad
-	doins -r "${S2}"/logos/*
-
-	cd "${WORKDIR}/${VDRPLUGIN}-${PV}"
-	dodoc README HISTORY
-}
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.3.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.3.ebuild
deleted file mode 100644
index 5c1c073d48bd..000000000000
--- a/media-plugins/vdr-markad/vdr-markad-0.1.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.3.ebuild,v 1.1 2012/03/02 17:18:35 hd_brummy Exp $
-
-EAPI="4"
-
-inherit vdr-plugin eutils
-
-VERSION="888" # every bump, new version
-
-DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-markad/"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6
-		virtual/ffmpeg[mp3,x264]
-		!media-video/noad"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${VDRPLUGIN}-${PV}/plugin"
-S2="${WORKDIR}/${VDRPLUGIN}-${PV}/command"
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	cd "${S2}"
-	sed -i Makefile \
-		-e "s:\$(CXXFLAGS) \$(OBJS):\$(CXXFLAGS) \$(LDFLAGS) \$(OBJS):"
-
-	if has_version ">=media-video/vdr-1.7.15"; then
-		sed -e "s:2001:6419:" -i markad-standalone.cpp
-	fi
-}
-
-src_compile() {
-	vdr-plugin_src_compile
-
-	cd "${S2}"
-	emake markad || die "Compiling command-line markad binary failed"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S2}"
-	dobin markad
-
-	insinto /var/lib/markad
-	doins -r "${S2}"/logos/*
-
-	cd "${WORKDIR}/${VDRPLUGIN}-${PV}"
-	dodoc README HISTORY
-}
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
index 82d609cba381..403b011afff4 100644
--- a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
+++ b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild,v 1.2 2013/06/17 19:57:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild,v 1.3 2014/01/08 02:32:04 hd_brummy Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit vdr-plugin-2
 
@@ -12,7 +12,7 @@ DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
 HOMEPAGE="http://projects.vdr-developer.org/projects/plg-markad/"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""