Fix for building with media-video/ffmpeg-0.4.9_p20080326, wrt bug #231063.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

10 files changed, 278 insertions, 20 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 5f550b31b4f4..1633c99bf360 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.207 2008/06/13 22:17:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.208 2008/07/07 19:39:26 loki_val Exp $
+
+*k3b-1.0.5-r2 (07 Jul 2008)
+
+  07 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch, k3b-0.12.17.ebuild,
+  k3b-1.0.3.ebuild, k3b-1.0.4.ebuild, k3b-1.0.4-r1.ebuild, k3b-1.0.5.ebuild,
+  k3b-1.0.5-r1.ebuild, +k3b-1.0.5-r2.ebuild:
+  Fix for building with media-video/ffmpeg-0.4.9_p20080326, wrt bug #231063.
 
 *k3b-1.0.5-r1 (13 Jun 2008)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 95b740a802d0..77bc7e17fd5d 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -5,6 +5,7 @@ AUX k3b-1.0.1-hidden.patch 1349 RMD160 15af630c21a2b7f60247917d59e6f63ed7ab2196
 AUX k3b-1.0.4-eject_186173.patch 3382 RMD160 2635fd05f35fd68a2eb9fac0f481accf711b81c3 SHA1 d7c52ee27631fd2abf0492d12a635d2ab9f33cdb SHA256 dccc64f4163b734122df739b7887e4fd2fe9cdd4d5522f9b02a43548fc77d2f2
 AUX k3b-1.0.5-desktop-entry.diff 1756 RMD160 540b5336fde1206eba74ac25a4fd0276978ad9c6 SHA1 d817a1da34cc6207a1d5fcac0d5ba67a3964afc0 SHA256 3d89ee4194abe8312e7373161bac8b9134850906be9c6e738571f9de7adfb34b
 AUX k3b-1.0.5-eject_186173.patch 3382 RMD160 2635fd05f35fd68a2eb9fac0f481accf711b81c3 SHA1 d7c52ee27631fd2abf0492d12a635d2ab9f33cdb SHA256 dccc64f4163b734122df739b7887e4fd2fe9cdd4d5522f9b02a43548fc77d2f2
+AUX k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch 2991 RMD160 8d0204a12cfe1eabe03e66b6201e2164f01cd80d SHA1 6bab88b9e4619a7f61b82c6e59af9a7ef784f71b SHA256 e2db198914acbda0c33c20537449cf7b729345f9d8af0052701259de0b27ff21
 DIST k3b-0.12.17.tar.bz2 4008650 RMD160 bb791d7d003285f6623229eae213cf224fd3a128 SHA1 ae23be594b6e2c116fd4c2af8cefb438423d1285 SHA256 067ef9d621bed9a1c385c201b13810f11305edf03a7da0793cb059bb578700b7
 DIST k3b-1.0.3.tar.bz2 5092806 RMD160 b51dcc8cd0bd4c0b1e9b97221596360a9d6be2f1 SHA1 cf9eee45eebd280a069c7f94924237bdec6bbd06 SHA256 c5d1afe150de90c898f6566e14bf1e3d868dc4a9e8523c2065b283108b410eb9
 DIST k3b-1.0.4.tar.bz2 5115790 RMD160 495090c36744e9a5ccd02621209eda2462c93476 SHA1 c420c6ca3a1f7405081a85014ef3e3f70e269223 SHA256 2b384127c330bf6c9ef5d08733b0da2d815aec66893a8fc628b746181f06d4bb
@@ -13,11 +14,12 @@ DIST k3b-i18n-0.12.17.tar.bz2 5714933 RMD160 f36c4ea2da170d5c0a797a2c966b2497ac6
 DIST k3b-i18n-1.0.3.tar.bz2 7613565 RMD160 397bf05ac59e9472d85f8d7bc0dd9b1fe8e82a80 SHA1 7904774f0944aa2f388392e4623079a7082157bc SHA256 9bd8da6582979512887d1559aae8b4faad5d931cab4d85097cfb9189b26b4d22
 DIST k3b-i18n-1.0.4.tar.bz2 7581613 RMD160 910e64ef0c08cada51f17e31c902eb01d5bbf5be SHA1 e111ba113c2ff47730bc5cb4a7f6f88911bc2b94 SHA256 a2627ac27d4a821a903b5a04ef927d025e5db1a0b41517ff4930c4a5c76f3352
 DIST k3b-i18n-1.0.5.tar.bz2 7732137 RMD160 6f08c6851da5d25ed4b2ead4ad0c4073ba94e246 SHA1 8697c0f0a9fa458895519a5d94c50120333a71c8 SHA256 068b170cd63c97263d21165b7b5106a8176f2499a1ebcec9baa68b7628395767
-EBUILD k3b-0.12.17.ebuild 3624 RMD160 f816af9be9d7a63a8e7c67e0ea0d50e66b60f7a8 SHA1 bf1af17ffad2f4f74cc4cfa3165cc8ffdff61eae SHA256 ea46a2ffc458833b73c81d132f5cc6b45c6eb2aa494d56cef11e1ae10ceaf495
-EBUILD k3b-1.0.3.ebuild 4261 RMD160 312c42c0e04ee742cbd7f87f76739c4deb2146cc SHA1 bab975694c007f75d2b5c79d08b634ce13238b21 SHA256 772e8da184ab0d4b7f049af3b8e76c4be6380186ec0a1bb22394afb5855daae8
-EBUILD k3b-1.0.4-r1.ebuild 4499 RMD160 c2222ec434c0426cd0b0d19fa3e0f25a69f83af4 SHA1 d928febc883a1a04f317117fff7bbe0308ab1fde SHA256 c31c7825bd22994db43a83a98ec01a6d3032bdf2c8cb8242062c353010b8341f
-EBUILD k3b-1.0.4.ebuild 4236 RMD160 3649bb5a419a6409b2dde525b7972d3ec652e1aa SHA1 cc95beaf328df2c5c1baf082bbe54dbe9599dd40 SHA256 ad29eb01f6da2230cfb679bf1a449525a33aaa065a83750f650f249b8f5739a6
-EBUILD k3b-1.0.5-r1.ebuild 4298 RMD160 4f46a1929c07d4923b671c04d8e482ad1f165327 SHA1 d8091bab883e33158927a1bd8ceefe60b7814f97 SHA256 7541d593bd1719d38381300b8c40282348ba8e1e3556d0735eefd1264684e2f6
-EBUILD k3b-1.0.5.ebuild 4497 RMD160 0d56b842cfff6b922aaf079e0612f4a3e305c872 SHA1 324c95657ddfd3c7f0c6ffd3f9f080dbf699aa66 SHA256 82b6f7baabc29861671db8114230e372f5cacf8a0198460623d859589fa5009c
-MISC ChangeLog 30354 RMD160 a3fbd0de54591b854e3df5044845832a9703ff9f SHA1 358b73c86e278e501814db5d256a6196f87d0d9f SHA256 545c7d162490bfe4c6898a8a80bd363cb09973a0f447da13809e63603e608078
+EBUILD k3b-0.12.17.ebuild 3645 RMD160 dd4648d745b5987fd95017bce697de1a3e56c321 SHA1 0000251d96019ecb3b1289603f70efb64c74c4d9 SHA256 077112a79739d88eabb2fc9c4def003a36fa4b2be0a3d46bbe02e18657778b19
+EBUILD k3b-1.0.3.ebuild 4282 RMD160 8c3d0aaa89efc01c1fea0379ae974ef0c0f8ac50 SHA1 3816fb6f042eaa27dbc8b1102246543602e1721c SHA256 b778a9c97e408f14b9c1e36dcd2567b9d3fbc95cd224bdb7accf5bc95b5b8d54
+EBUILD k3b-1.0.4-r1.ebuild 4514 RMD160 749783ccd4372193dbf23f29c992d68a79f1de5b SHA1 03f3720bdac1b3decb723414f080354c0dee3984 SHA256 5e8d38b6d3e3984c99d3e985e5935b026632fe3d0049242bc1fb9ad72e8d50a4
+EBUILD k3b-1.0.4.ebuild 4255 RMD160 ccdc0eb639e96ac360907d6bc67841633f949cb6 SHA1 804b49671d2f687b4cb83b5a5309500879b9588f SHA256 5fb468f6cb7676cbee6e814f73eb00767a13ec6232f6bdca2fd19b4f442b9a37
+EBUILD k3b-1.0.5-r1.ebuild 4318 RMD160 235579de927264771e00721a57ae44c849553f3a SHA1 113e3811175947fade6b69537b0fa06199888822 SHA256 bebf54e81d25dcf1d2fe34ac3aaf7bc99543fb5a0c5f55e830fa6055f7479f07
+EBUILD k3b-1.0.5-r2.ebuild 4378 RMD160 5ae44145bd661c2b7d70236a9b6507e54ecb139d SHA1 b76b61b15f8694d9ff7ebda2cfbb01ceced18f64 SHA256 eb9162b5099734215762a2258f70b33bb7e82f8257da9f3d20b1e05d363fae82
+EBUILD k3b-1.0.5.ebuild 4511 RMD160 ef33c75a421e870d2e8d7a0bb32bee3f9e8a4ba5 SHA1 d65fb1262d97626904b3e91cee5ff9b3c8c913f6 SHA256 5b976a1d7598c33a250481ce473f8b429f4ca9faefb93abe82f31b785f630a00
+MISC ChangeLog 30712 RMD160 f5812f399f21b77e7581c56975bad61fa0dec6ee SHA1 c27b1e7313b978e6d1ac8679effcc8a23297fad9 SHA256 0503c18024fde377fdfb9c8ae0971cc9e112f87e1741d4db4be83ce260794b5c
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
diff --git a/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch b/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch
new file mode 100644
index 000000000000..dc9bee0d0769
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch
@@ -0,0 +1,100 @@
+diff -NrU5 k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
+--- k3b-1.0.5.orig/configure.in	2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/configure.in	2008-07-07 20:39:13.000000000 +0200
+@@ -574,12 +574,12 @@
+ 	AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+ 	AC_LANG_SAVE
+ 	AC_LANG_CPLUSPLUS
+ 	AC_COMPILE_IFELSE( 
+ 		extern "C" {
+-		#include <ffmpeg/avformat.h>
+-		#include <ffmpeg/avcodec.h>
++		#include <libavformat/avformat.h>
++		#include <libavcodec/avcodec.h>
+ 		}
+ 
+ 		int main() {
+ 		  AVFormatContext* fc = 0;
+ 		  AVPacket* p = 0;
+@@ -589,12 +589,12 @@
+ 	[ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+ 	OLD_LIBS=$LIBS
+ 	LIBS="-lavformat -lavcodec $LIBS"
+ 	AC_LINK_IFELSE( 
+ 		extern "C" {
+-		#include <ffmpeg/avformat.h>
+-		#include <ffmpeg/avcodec.h>
++		#include <libavformat/avformat.h>
++		#include <libavcodec/avcodec.h>
+ 		}
+ 
+ 		int main() {
+ 		  AVFormatContext* fc = 0;
+ 		  AVPacket* p = 0;
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in	2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in	2008-07-07 20:43:02.000000000 +0200
+@@ -19,12 +19,12 @@
+ 	AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+ 	AC_LANG_SAVE
+ 	AC_LANG_CPLUSPLUS
+ 	AC_COMPILE_IFELSE( 
+ 		extern "C" {
+-		#include <ffmpeg/avformat.h>
+-		#include <ffmpeg/avcodec.h>
++		#include <libavformat/avformat.h>
++		#include <libavcodec/avcodec.h>
+ 		}
+ 
+ 		int main() {
+ 		  AVFormatContext* fc = 0;
+ 		  AVPacket* p = 0;
+@@ -34,12 +34,12 @@
+ 	[ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+ 	OLD_LIBS=$LIBS
+ 	LIBS="-lavformat -lavcodec $LIBS"
+ 	AC_LINK_IFELSE( 
+ 		extern "C" {
+-		#include <ffmpeg/avformat.h>
+-		#include <ffmpeg/avcodec.h>
++		#include <libavformat/avformat.h>
++		#include <libavcodec/avcodec.h>
+ 		}
+ 
+ 		int main() {
+ 		  AVFormatContext* fc = 0;
+ 		  AVPacket* p = 0;
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp	2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp	2008-07-07 20:45:07.000000000 +0200
+@@ -20,11 +20,11 @@
+ 
+ #include <kdebug.h>
+ #include <k3bpluginfactory.h>
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ #include <math.h>
+ 
+ 
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2008-07-07 20:44:02.000000000 +0200
+@@ -16,12 +16,12 @@
+ #include <config.h>
+ 
+ #include "k3bffmpegwrapper.h"
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ #include <string.h>
+ 
+ #include <klocale.h>
diff --git a/app-cdr/k3b/k3b-0.12.17.ebuild b/app-cdr/k3b/k3b-0.12.17.ebuild
index c843a255ce0a..b3dc3abb6aeb 100644
--- a/app-cdr/k3b/k3b-0.12.17.ebuild
+++ b/app-cdr/k3b/k3b-0.12.17.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/k3b/k3b-0.12.17.ebuild,v 1.16 2008/06/15 12:04:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.17 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -19,7 +19,7 @@ DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.3.ebuild b/app-cdr/k3b/k3b-1.0.3.ebuild
index a23756de86e0..82ee3916bb5c 100644
--- a/app-cdr/k3b/k3b-1.0.3.ebuild
+++ b/app-cdr/k3b/k3b-1.0.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/k3b/k3b-1.0.3.ebuild,v 1.6 2008/06/15 12:04:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.3.ebuild,v 1.7 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -23,7 +23,7 @@ DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.4-r1.ebuild b/app-cdr/k3b/k3b-1.0.4-r1.ebuild
index 9cfae140728c..8a695038c7e4 100644
--- a/app-cdr/k3b/k3b-1.0.4-r1.ebuild
+++ b/app-cdr/k3b/k3b-1.0.4-r1.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/k3b/k3b-1.0.4-r1.ebuild,v 1.1 2008/04/26 22:43:49 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.4-r1.ebuild,v 1.2 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -22,7 +22,7 @@ DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.4.ebuild b/app-cdr/k3b/k3b-1.0.4.ebuild
index 069ae8271672..7c46030d0e20 100644
--- a/app-cdr/k3b/k3b-1.0.4.ebuild
+++ b/app-cdr/k3b/k3b-1.0.4.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/k3b/k3b-1.0.4.ebuild,v 1.8 2008/01/05 19:56:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.4.ebuild,v 1.9 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -22,7 +22,7 @@ DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.5-r1.ebuild b/app-cdr/k3b/k3b-1.0.5-r1.ebuild
index 4870d38bd908..23c2ca8fccc5 100644
--- a/app-cdr/k3b/k3b-1.0.5-r1.ebuild
+++ b/app-cdr/k3b/k3b-1.0.5-r1.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/k3b/k3b-1.0.5-r1.ebuild,v 1.1 2008/06/13 22:17:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r1.ebuild,v 1.2 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -22,7 +22,7 @@ DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.5-r2.ebuild b/app-cdr/k3b/k3b-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..71ff37d5d408
--- /dev/null
+++ b/app-cdr/k3b/k3b-1.0.5-r2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r2.ebuild,v 1.1 2008/07/07 19:39:26 loki_val Exp $
+
+inherit kde eutils
+
+MY_P=${P/_/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa css dvdr dvdread encode ffmpeg flac hal mp3 musepack musicbrainz
+	sndfile vcd vorbis emovix"
+
+DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
+	media-libs/libsamplerate
+	media-libs/taglib
+	>=media-sound/cdparanoia-3.9.8
+	sndfile? ( media-libs/libsndfile )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libmad )
+	musepack? ( media-libs/libmpcdec )
+	vorbis? ( media-libs/libvorbis )
+	musicbrainz? ( =media-libs/musicbrainz-2* )
+	encode? ( media-sound/lame )
+	alsa? ( media-libs/alsa-lib )
+	dvdread? ( media-libs/libdvdread )"
+
+RDEPEND="${DEPEND}
+	virtual/cdrtools
+	>=app-cdr/cdrdao-1.1.7-r3
+	media-sound/normalize
+	dvdr? ( >=app-cdr/dvd+rw-tools-7.0 )
+	css? ( media-libs/libdvdcss )
+	encode? ( media-sound/sox
+				media-video/transcode )
+	vcd? ( media-video/vcdimager )
+	emovix? ( media-video/emovix )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+need-kde 3.5
+
+PATCHES=(	"${FILESDIR}/k3b-1.0.5-desktop-entry.diff"
+		"${FILESDIR}/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch"	)
+
+I18N="${PN}-i18n-${PV}"
+
+# Supported languages and translated documentation
+LANGS="af ar bg br bs ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hu is it ja ka lt mk ms nb nds nl nn pa pl pt pt_BR ru rw se sk sr sr@Latn sv ta tr uk uz zh_CN zh_TW"
+for X in ${LANGS}; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
+	IUSE="${IUSE} linguas_${X}"
+done
+
+pkg_setup() {
+	if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
+		eerror "but sys-apps/dbus is not built with Qt3 support."
+		die "Please, rebuild sys-apps/dbus with the \"qt3\" USE flag."
+	fi
+	if use encode && ! built_with_use media-video/transcode dvdread; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"encode\""
+		eerror "USE flag enabled, however media-video/transcode was not built"
+		eerror "with libdvdread support. Also keep in mind that enabling"
+		eerror "the dvdread USE flag will cause k3b to use libdvdread as well."
+		die "Please, rebuild media-video/transcode with the \"dvdread\" USE flag."
+	fi
+
+	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
+		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
+		eerror "Please enable the cxx USE flag for media-libs/flac"
+		die "Missing FLAC C++ bindings."
+	fi
+
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		cd "${WORKDIR}/${I18N}"
+		for X in ${LANGS}; do
+			use linguas_${X} || rm -rf "${X}"
+		done
+		rm -f configure
+	fi
+	rm -f "${S}/configure"
+}
+
+src_compile() {
+	local myconf="--enable-libsuffix=		\
+			--with-external-libsamplerate	\
+			--without-resmgr				\
+			--without-cdrecord-suid-root	\
+			--without-k3bsetup				\
+			$(use_with hal)					\
+			$(use_with encode lame)			\
+			$(use_with ffmpeg)				\
+			$(use_with flac)				\
+			$(use_with vorbis oggvorbis)	\
+			$(use_with sndfile)				\
+			$(use_with mp3 libmad)			\
+			$(use_with musepack)			\
+			$(use_with musicbrainz)			\
+			$(use_with alsa)"
+
+	# Build process of K3b
+	kde_src_compile
+
+	# Build process of K3b-i18n
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		KDE_S="${WORKDIR}/${I18N}" \
+		kde_src_compile
+	fi
+}
+
+src_install() {
+	kde_src_install
+	dodoc FAQ KNOWNBUGS PERMISSIONS
+
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		KDE_S="${WORKDIR}/${I18N}" \
+		kde_src_install
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}
diff --git a/app-cdr/k3b/k3b-1.0.5.ebuild b/app-cdr/k3b/k3b-1.0.5.ebuild
index 707c30d9cdf0..fd25aa606e6b 100644
--- a/app-cdr/k3b/k3b-1.0.5.ebuild
+++ b/app-cdr/k3b/k3b-1.0.5.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/k3b/k3b-1.0.5.ebuild,v 1.1 2008/05/31 21:12:14 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5.ebuild,v 1.2 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -22,7 +22,7 @@ DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )