Added a patch for gcc 4.3 compatibility as kindly provided by Peter Alfredsen on bug 214272. Added a missing dependency on ffmpeg which fixes bug 207419.

Package-Manager: portage-2.1.4.4

4 files changed, 35 insertions, 5 deletions

diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index e36b884e10ba..908b459147fb 100644
--- a/app-cdr/k9copy/ChangeLog
+++ b/app-cdr/k9copy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/k9copy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.34 2008/01/20 15:10:53 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.35 2008/03/28 20:43:18 philantrop Exp $
+
+  28 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/k9copy-1.2.3-gcc43.patch, k9copy-1.2.3.ebuild:
+  Added a patch for gcc 4.3 compatibility as kindly provided by Peter
+  Alfredsen on bug 214272. Added a missing dependency on ffmpeg.
 
 *k9copy-1.2.3 (20 Jan 2008)
 
diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
index f771667e6439..d8f77f16dd92 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,6 +1,7 @@
 AUX k9copy-1.1.2_p2-desktop-entry.diff 509 RMD160 c634e6c868fc0a520633e0409a1fa1356c66a51e SHA1 10a78b047f7e79e5c1474b0b870d0758f3dae395 SHA256 918da88482e314a2ad499efda290da1e111169059f54615cfd8e96ae6306dbd3
 AUX k9copy-1.2.2-desktop-entry.diff 977 RMD160 56ab28a458412154c196735004edf856c7ba50b7 SHA1 d30ba78a90c48f4d036c7f2677391091b073a70e SHA256 6b6490c5ce369a0b1c3c8d66d5745f55734548d405dd059eac41c6f21eec89c6
 AUX k9copy-1.2.3-desktop-entry.diff 437 RMD160 7ab71a20c362cdb7f50346dfe93256320cac3886 SHA1 602ce79416ea5a7d3531f8b32f15aea4eea2af07 SHA256 01e9dbe20508b64a431b91ade3f0258d7ef44a8c72688df9388015458af10e44
+AUX k9copy-1.2.3-gcc43.patch 769 RMD160 2711f9a8f988ab4906715794319b134055519bf7 SHA1 122d4a9c1a0c8163b76351a7551a87639247f1c1 SHA256 f098660456973036229b2f9932704161f2aae028208283c7701d5e7b6952d49d
 DIST k9copy-1.0.4.tar.gz 1099333 RMD160 b6f3b854db48fbb6fceb17311ac710ceda58e5ff SHA1 dd9915ded2e548eb78e1b5023f63ae4e3c35a96c SHA256 566b7cb0180ffb1fde8f1d0281432b9914755a646cca60f89a6372f79e256039
 DIST k9copy-1.1.3.tar.gz 2674016 RMD160 ea49c99321b4e70c12e24662ac102e79f61b3edd SHA1 2ef4dea252cce9d1dca0dfb8f439e8f7449ee582 SHA256 7b1a458b775894edbaea4a1c076c0a329572249057fc23d4167461e4b1be742d
 DIST k9copy-1.2.0.tar.gz 2762065 RMD160 bf805c59eb6b61de7a250c8af56419ddd6eb702a SHA1 c1585998774b5debdeec3ea0efb7254f6deb3ca6 SHA256 ac442a05c427c441f54dd5a0e7f5bd30bc48a396db2593697ae76f83d1ebaa04
@@ -12,6 +13,6 @@ EBUILD k9copy-1.1.3.ebuild 1062 RMD160 e43ffe60500772e6e8eb4d872dda250e365a2448
 EBUILD k9copy-1.2.0.ebuild 1115 RMD160 29d6ccd7d1be56512015c83311551324cadb0404 SHA1 e05ef04afb4b4e19b4b43e56c4febffcb733d7ea SHA256 4d57afef1205721caade7bd4dcd08c658e89077fdeda2795b8764031a16cec0f
 EBUILD k9copy-1.2.1.ebuild 1405 RMD160 aa00c4289950380ee142f284fa68717fe04db0cc SHA1 b47ee72a82a7bc1142fad14cdf471e19e8d25f1f SHA256 9a6113d6dc2e921838e4483facca373d3aa23239f47629f08287c22bdf1d3ba0
 EBUILD k9copy-1.2.2.ebuild 1103 RMD160 fbb48d805c0d51e53572fcf6e0ea203aaad7f8eb SHA1 cf5c61f51e6e3b2934f42afcfe265da5f0ec3a95 SHA256 883ba19af7fd1fdbb82142011e524d9213b49d9346f3b5390251ff6b97eefb95
-EBUILD k9copy-1.2.3.ebuild 1102 RMD160 7269f63548761ff7eea705ee5fec5c653e1fb9d9 SHA1 46c902bbda733ebe9696e9f00efbc235f80ce440 SHA256 2395aef1038ffa44355c68de8bde1ef922de81eb45c1e60c5cd904968d4adf23
-MISC ChangeLog 5667 RMD160 ceb34d01fd4881bd578f8cf5005852796e72a479 SHA1 5f31ca8a6bcdfd1dc18ef3c948b2f86f7925c38c SHA256 f8be4c5a9c96d3d25b6c93579504bc338189e6979150d58653d89df4943b5c0f
+EBUILD k9copy-1.2.3.ebuild 1164 RMD160 94cf05432a1e16474c75d1e5baed9badfaca437b SHA1 96d6225295e59067aca20213f835285c8d70b3ac SHA256 f64e3eafed978bf96e75dbdd40ad5d4a6c98d4c36db66b16ea3375f7cd8efb75
+MISC ChangeLog 5919 RMD160 029f0c75fa40984e7d7782cd2c936b08a7c64049 SHA1 b9f877fe9b79fca22bcff1a45b567a37ed742578 SHA256 e2f1f2b451bee736b5ad617f03e2a0d9cee7913ac941e5b4426493e1fefb663d
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
diff --git a/app-cdr/k9copy/files/k9copy-1.2.3-gcc43.patch b/app-cdr/k9copy/files/k9copy-1.2.3-gcc43.patch
new file mode 100644
index 000000000000..3807ea8caa02
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-1.2.3-gcc43.patch
@@ -0,0 +1,22 @@
+diff -up k9copy-1.2.2/k9author/k9avidecode.cpp.gcc43~ k9copy-1.2.2/k9author/k9avidecode.cpp
+--- k9copy-1.2.2/k9author/k9avidecode.cpp.gcc43~	2008-01-13 11:04:31.000000000 +0000
++++ k9copy-1.2.2/k9author/k9avidecode.cpp	2008-01-13 11:04:31.000000000 +0000
+@@ -9,6 +9,7 @@
+ // Copyright: See COPYING file that comes with this distribution
+ //
+ //
++#include <stdlib.h>
+ #include "k9avidecode.h"
+ #include <ffmpeg/avcodec.h>
+ #include <qimage.h>
+diff -up k9copy-1.2.2/src/k9glwidget.cpp.gcc43~ k9copy-1.2.2/src/k9glwidget.cpp
+--- k9copy-1.2.2/src/k9glwidget.cpp.gcc43~	2008-01-13 11:05:42.000000000 +0000
++++ k9copy-1.2.2/src/k9glwidget.cpp	2008-01-13 11:05:42.000000000 +0000
+@@ -10,6 +10,7 @@
+ //
+ //
+ 
++#include <stdlib.h>
+ #include "k9glwidget.h"
+ 
+ #ifdef HAVE_OPENGL
diff --git a/app-cdr/k9copy/k9copy-1.2.3.ebuild b/app-cdr/k9copy/k9copy-1.2.3.ebuild
index 171f1a71eaaa..c8b0288215b3 100644
--- a/app-cdr/k9copy/k9copy-1.2.3.ebuild
+++ b/app-cdr/k9copy/k9copy-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.3.ebuild,v 1.2 2008/01/21 03:24:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.3.ebuild,v 1.3 2008/03/28 20:43:18 philantrop Exp $
 
 EAPI="1"
 
@@ -24,11 +24,13 @@ DEPEND="media-video/dvdauthor
 	>=app-cdr/k3b-0.12.10
 	dev-libs/dbus-qt3-old
 	sys-apps/hal
+	>=media-video/ffmpeg-0.4.9_p20070616
 	media-video/mplayer"
 
 need-kde 3.5
 
-PATCHES="${FILESDIR}/k9copy-1.2.3-desktop-entry.diff"
+PATCHES="${FILESDIR}/${P}-desktop-entry.diff
+		${FILESDIR}/${P}-gcc43.patch"
 
 pkg_setup() {
 	kde_pkg_setup