x86 stable. Fixes bug#412803.

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

4 files changed, 17 insertions, 79 deletions

diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
index d769cacbd187..544fc7c11b15 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX k9copy-2.3.7-ffmpeg.patch 664 RMD160 fad7bd83cf932edb13ce2a5b332dda90d8943c64 SHA1 d9be05d7a362ad95fcf584ce22611e18d06a136d SHA256 76c0e7f4e29ef41ecc7948f1a81eaabd41f00fcc520401d9943c24e70a301d58
-DIST k9copy-2.3.7-Source.tar.gz 1571305 RMD160 c3b57c77bdb32365f9f694101f1eaf59059d22d9 SHA1 8b0aa8f1e63e4a396746f88ca9c763808895b7d0 SHA256 516f4108a189a050f0aadf5b617d151b6b0e52c18823941f2b895073c104e74e
 DIST k9copy-2.3.8-Source.tar.gz 1589535 RMD160 1855649ca84140718fc26d97a79ee23e8eb90fa2 SHA1 15c9900c689d4d98d8ebae9fbe6e7f7de158cc32 SHA256 cf5e2d9faf7821561e478ed1fc9b63bbcc3448405d7b7866f68b018d16b42fdf
-EBUILD k9copy-2.3.7.ebuild 1197 RMD160 da157fea1f327f2cc5932615f92f68007f37d1b6 SHA1 0f1b421c66c96b998bc6a5f5cc9d79a70e362fc9 SHA256 3d5de4af5f25483b7d01a3af9e28653d20cdb1773807e484d41848ff76007753
-EBUILD k9copy-2.3.8.ebuild 1190 RMD160 247526946590d1454479f223cb372a3ac2aec19b SHA1 62441b3b009b7fb0d110d573f4642ffc4373627e SHA256 acd1f596878feb278d789386c2a40dec04bec7947c405cb9d681e2be1f48c830
+EBUILD k9copy-2.3.8.ebuild 1195 RMD160 bd2daeae1a866031b89c6a7d9ed3d81f929d910b SHA1 9d452e4b9a12f0e0b37a1aefba8d4c243430e4b5 SHA256 ebdf7c0e226322c9e39048d9bcab05ea2392fbd05a92d75516ddb8ec46bfc006
 MISC ChangeLog 11436 RMD160 c6113ad50a2324818be775de4f0248e0d6625164 SHA1 54a8187ce876eb38eb4e30c3e3953642138c817c SHA256 b760c678f391798f16ed69d33bcc672a05d053ee4ef0e5ce3dcaaa24d5d1c35d
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPlXkiAAoJEOTDgjZ80txd4nUH/jHIQuV0JHkSHheomlmhtH1X
-fCiUvKKo/JV8AxhiARFb9eaJRkQJ/6OH290hUtZbduzk8jFt3cOCNof+n6DSBGmz
-xkjpOVbheqhaNPZuIw/NgkO5NVp12p7nNvu2mLO8d2SjvRRzQsReNvP122ZizZrV
-yWxGw5SKrFrBRu9n6Dgscb1KzTbQ6pGNA8+hjmULHyXjZ0CFGWCBknL9/CZrofcQ
-eGbmFOWGkNAJP1LLUrvjxsjYH546xhf5vQ+J6A1BZ19x2CoM1Auv+zq4wnl/zm70
-DCcs1dJbSHvohjQepu6L7fnUCXJzNwINfb67Yi9nsaaOnG4N2eXo2KrXoo7UzkY=
-=/1XU
+iQIcBAEBAgAGBQJPs1zEAAoJEOSiRoyO7jvoFQIP/AqG4d5ZanBnAmEiSTZswtsJ
+/a5Qk1CZo8N+ca6kXoaPcL5AHn4gCULeh3wksxALJ/WBDYo9delmlrBwaQbURlch
+5t4VPNhsnfgMtiVVPeFwJCEpeQnQ97uUzwkc5mP/4aPDOULpqIEJ2r6puqNQmLX5
+4gXvUVsGV+5FGkGZWEGXss8DiTL9UtOkgCffOr+P3mAFl+7HXgg+p58h1JUO4lRO
+3uGdE46/cGyBv/pAB9G4+TJuInM1WMpH8lcZEVd+YgOtTifa9+Om9FItozmuyYrj
+KojmmIIxiHuqa4JLtWJydynWLEVPpO36wbZ1eSqdT6peNKMnD7pA3kzOHPltM+vb
+CEzOI7RQJ2TnM/P/vJEna0Njj5qv5cKy4+8nXa1tYWnXuO5TSLdgKmGZb6uzs8aj
+DGSZZyRhmLCJzDDac96uVf/Zn/oJLb6/4bVCTPe1xhBkavke5FGx8VHM9dldv8qq
+5rEF8J5rHkgOjQZEQhndZ7/6cGovfBCPNrmCc7egCPCXr72aYP7VU8uUTVXCKV7c
+FpYhIq+oQUo81yG4h5z1c54dcGJt/8xpH1NoZqMZjysdM+SSlgkoZLQX+PaIiqUh
+HIeEmeHPA68N8UosMG7UOukBcsO9Z8Z6TMQDYPAphm4Gs5o6hnHMpny3Jzv6SWfW
+a8LuHHTYPC8NYVMlaFgJ
+=fdCm
 -----END PGP SIGNATURE-----
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="