Remove old.

(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

3 files changed, 5 insertions, 104 deletions

diff --git a/media-video/2mandvd/2mandvd-1.8.4.ebuild b/media-video/2mandvd/2mandvd-1.8.4.ebuild
deleted file mode 100644
index ca1eb0f3e50b..000000000000
--- a/media-video/2mandvd/2mandvd-1.8.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.8.4.ebuild,v 1.5 2013/03/02 22:06:19 hwoarang Exp $
-
-EAPI=4
-LANGS="cs de en it ru"
-
-inherit qt4-r2
-
-MY_PN="2ManDVD"
-
-DESCRIPTION="The successor of ManDVD"
-HOMEPAGE="http://kde-apps.org/content/show.php?content=99450"
-SRC_URI="http://download.tuxfamily.org/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="media-libs/libsdl
-	virtual/ffmpeg
-	virtual/glu
-	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-"
-RDEPEND="${DEPEND}
-	|| ( app-cdr/cdrkit app-cdr/cdrtools )
-	dev-lang/perl
-	media-fonts/dejavu
-	media-gfx/exif
-	media-libs/netpbm
-	media-sound/sox
-	media-video/dvdauthor
-	media-video/ffmpegthumbnailer
-	media-video/mjpegtools
-	media-video/mplayer[encode]
-"
-
-S=${WORKDIR}/${MY_PN}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.3-libav.patch"
-	"${FILESDIR}/${PN}-1.8.4-libavformat54.patch"
-)
-
-src_prepare() {
-	# Cleaning old backup files
-	find . -name "*~" -delete || die
-
-	# Delete useless chmod that violates the sandbox
-	sed -i -e '/chmod/d' ${MY_PN}.pro || die
-
-	# Fix desktop file
-	sed -i -e '/^Categories=/s/GNOME;AudioVideo;//' ${MY_PN}.desktop || die
-
-	qt4-r2_src_prepare
-}
-
-pkg_postinst() {
-	elog "You may wish to install media-video/xine-ui and/or build"
-	elog "media-sound/sox with USE=mad for improved media handling support."
-}
diff --git a/media-video/2mandvd/ChangeLog b/media-video/2mandvd/ChangeLog
index cf069ffe8ca9..321303add1af 100644
--- a/media-video/2mandvd/ChangeLog
+++ b/media-video/2mandvd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/2mandvd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.34 2015/05/15 07:29:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.35 2015/05/15 16:57:37 kensington Exp $
+
+  15 May 2015; Michael Palimaka <kensington@gentoo.org> -2mandvd-1.8.4.ebuild,
+  -files/2mandvd-1.8.4-libavformat54.patch:
+  Remove old.
 
   15 May 2015; Pacho Ramos <pacho@gentoo.org> 2mandvd-1.8.5.ebuild:
   amd64/x86 stable, bug #547658
diff --git a/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch b/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch
deleted file mode 100644
index 454a8efc9a2b..000000000000
--- a/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN 2ManDVD.old/videowrapper.cpp 2ManDVD/videowrapper.cpp
---- 2ManDVD.old/videowrapper.cpp	2013-06-17 19:46:47.455636396 +0200
-+++ 2ManDVD/videowrapper.cpp	2013-06-17 19:55:04.156618725 +0200
-@@ -38,7 +38,7 @@
- int videowrapper::load_video(QString filename)
- {
-     // *** OUVERTURE DU FICHIER VIDEO ***
--    #ifdef avformat_open_input
-+    #if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,5,0)
-         if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0)
-         {
-     #else
-@@ -50,7 +50,7 @@
-     }
- 
-     // *** RECUPERATION DES INFORMATIONS DU MEDIA ***
--    if(av_find_stream_info(pFormatCtx)<0)
-+    if(avformat_find_stream_info(pFormatCtx, NULL)<0)
-     {
-         qDebug() << "CAN'T READ INFORMATION FROM VIDEO FILE : " << filename;
-         return 1;
-@@ -90,15 +90,10 @@
- 
-     // *** OUVERTURE DU CODEC ***
- 
--    if(avcodec_open(pCodecCtx, pCodec)<0)
--    {
-+    if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) {
-         qDebug() << "CAN'T FIND VIDEO CODEC";
-         return 1;
-     }
--    /*if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) {
--        qDebug() << "CAN'T FIND VIDEO CODEC";
--        return 1;
--    }*/
- 
-     img_convert_ctx = sws_getContext(pCodecCtx->width,
-                     pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,