x86 stable. Fixes bug#412803.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

3 files changed, 2 insertions, 67 deletions

diff --git a/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch b/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch
deleted file mode 100644
index c92582a8dd55..000000000000
--- a/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with ffmpeg/libav trunk after the big bump.
-
-Index: k9copy-2.3.7-Source/src/import/k9avidecode.cpp
-===================================================================
---- k9copy-2.3.7-Source.orig/src/import/k9avidecode.cpp
-+++ k9copy-2.3.7-Source/src/import/k9avidecode.cpp
-@@ -145,7 +145,7 @@ bool k9AviDecode::open(const QString & _
- // Find the first video stream
-     m_videoStream=-1;
-     for (i=0; i<m_FormatCtx->nb_streams; i++)
--        if (m_FormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) {
-+        if (m_FormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
-             m_videoStream=i;
-             break;
-         }
diff --git a/app-cdr/k9copy/k9copy-2.3.7.ebuild b/app-cdr/k9copy/k9copy-2.3.7.ebuild
deleted file mode 100644
index 63a3fabf8f58..000000000000
--- a/app-cdr/k9copy/k9copy-2.3.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.7.ebuild,v 1.5 2011/12/07 07:43:26 phajdan.jr Exp $
-
-EAPI=3
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca cs da de el es_AR es fr it ja nl pl pt_BR ru sr@Latn sr tr zh_TW"
-
-	MY_P=${P}-Source
-
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-	S=${WORKDIR}/${MY_P}
-else
-	ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
-	ESVN_PROJECT="k9copy"
-fi
-
-KDE_HANDBOOK="optional"
-
-inherit kde4-base
-
-DESCRIPTION="k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5."
-HOMEPAGE="http://k9copy.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libdvdread
-	>=media-libs/libmpeg2-0.5.1
-	media-libs/xine-lib
-	virtual/ffmpeg
-"
-RDEPEND="${DEPEND}
-	media-video/dvdauthor
-	media-video/mplayer
-"
-
-DOCS=( README )
-
-PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" )
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-	has_version '>=app-cdr/k3b-1.50' || elog "If you want K3b burning support in ${P}, please install app-cdr/k3b separately."
-}
diff --git a/app-cdr/k9copy/k9copy-2.3.8.ebuild b/app-cdr/k9copy/k9copy-2.3.8.ebuild
index f8a550caa92c..e7f9d22df39f 100644
--- a/app-cdr/k9copy/k9copy-2.3.8.ebuild
+++ b/app-cdr/k9copy/k9copy-2.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.3 2012/04/23 15:45:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.4 2012/05/16 07:52:27 scarabeus Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://k9copy.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug mplayer"
 
 DEPEND="