app-cdr/k3b: pkgmove to kde-apps/k3b

- Drop IUSE="emovix,musicbrainz" for missing deps in Gentoo ebuild repo
- Set KDEBASE=false for kde.eclass to set dependencies correctly

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

5 files changed, 236 insertions, 0 deletions

diff --git a/kde-apps/k3b/files/k3b-1.0.5-desktop-entry.diff b/kde-apps/k3b/files/k3b-1.0.5-desktop-entry.diff
new file mode 100644
index 00000000..5f2e42c6
--- /dev/null
+++ b/kde-apps/k3b/files/k3b-1.0.5-desktop-entry.diff
@@ -0,0 +1,53 @@
+--- src/k3b-cue.desktop.orig	2008-06-07 03:10:55.000000000 +0200
++++ src/k3b-cue.desktop	2008-06-07 03:11:06.000000000 +0200
+@@ -10,5 +10,3 @@
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+ MimeType=application/x-cue;
+-
+-Encoding=UTF-8
+--- src/k3b-iso.desktop.orig	2008-06-07 03:09:54.000000000 +0200
++++ src/k3b-iso.desktop	2008-06-07 03:10:46.000000000 +0200
+@@ -10,4 +10,3 @@
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+ MimeType=application/x-iso;
+-Encoding=UTF-8
+--- src/k3b.desktop.orig	2008-06-07 03:11:28.000000000 +0200
++++ src/k3b.desktop	2008-06-07 03:12:05.000000000 +0200
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=k3b %U
+ Icon=k3b
+-DocPath=k3b/index.html
++X-DocPath=k3b/index.html
+ GenericName=CD & DVD Burning
+ GenericName[af]=CD & DVD Skrywer
+ GenericName[ar]= اعداد كتابة القرص المدمج(CD)  و القرص المرئي الرقمي (DVD)
+@@ -117,8 +116,8 @@
+ Name[ar]= K3b
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+-MimeType=application/x-k3b
++MimeType=application/x-k3b;
+ X-KDE-StartupNotify=true
+ X-KDE-NativeMimeType=application/x-k3b;application/x-iso
+-Categories=KDE;Application;AudioVideo;DiscBurning;
++Categories=KDE;AudioVideo;DiscBurning;
+ X-DCOP-ServiceType=Unique
+--- src/Makefile.am.orig	2008-06-07 03:18:31.000000000 +0200
++++ src/Makefile.am	2008-06-07 03:19:31.000000000 +0200
+@@ -32,10 +32,7 @@
+ 
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+ 
+-xdg_apps_DATA = k3b.desktop
+-
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
+ 
+ ###################
+ # this 10 paths are KDE specific. Use them:
diff --git a/kde-apps/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch b/kde-apps/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch
new file mode 100644
index 00000000..dc9bee0d
--- /dev/null
+++ b/kde-apps/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/kde-apps/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch b/kde-apps/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch
new file mode 100644
index 00000000..5ae405f6
--- /dev/null
+++ b/kde-apps/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch
@@ -0,0 +1,23 @@
+Index: k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -194,7 +194,7 @@ QString K3bFFMpegFile::typeComment() con
+     return i18n("Windows Media v1");
+   case CODEC_ID_WMAV2:
+     return i18n("Windows Media v2");
+-  case CODEC_ID_MP3LAME:
++  case CODEC_ID_MP3:
+     return i18n("MPEG 1 Layer III");
+   case CODEC_ID_AAC:
+     return i18n("Advanced Audio Coding (AAC)");
+@@ -290,7 +290,8 @@ int K3bFFMpegFile::fillOutputBuffer()
+ #ifdef FFMPEG_BUILD_PRE_4629
+     int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
+ #else
+-    int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
++    d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++    int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
+ #endif
+ 				    (short*)d->outputBuffer, &d->outputBufferSize,
+ 				    d->packetData, d->packetSize );
diff --git a/kde-apps/k3b/files/k3b-1.0.5-libmpcdecsv7.patch b/kde-apps/k3b/files/k3b-1.0.5-libmpcdecsv7.patch
new file mode 100644
index 00000000..4128495d
--- /dev/null
+++ b/kde-apps/k3b/files/k3b-1.0.5-libmpcdecsv7.patch
@@ -0,0 +1,42 @@
+diff -ur k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
+--- k3b-1.0.5.orig/configure.in	2008-05-27 11:34:23.000000000 +0300
++++ k3b-1.0.5/configure.in	2009-07-26 18:07:39.000000000 +0300
+@@ -770,13 +770,13 @@
+ 
+   dnl - search for both the new and the old naming -
+ 
+-  KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
+-  	AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
++  KDE_CHECK_HEADERS(mpcdecsv7/mpcdec.h, [
++  	AC_CHECK_LIB(mpcdecsv7, mpc_decoder_setup, [
+   		have_mpc=yes
+-		MPC_LIBS="-lmpcdec"
++		MPC_LIBS="-lmpcdecsv7"
+ 		AC_DEFINE(
+ 			MPC_HEADER_FILE, 
+-			<mpcdec/mpcdec.h>, 
++			<mpcdecsv7/mpcdec.h>, 
+ 			[The header to include for MPC decoding.])
+ 		],
+ 		[], [], [])
+diff -ur k3b-1.0.5.orig/plugins/decoder/musepack/configure.in.in k3b-1.0.5/plugins/decoder/musepack/configure.in.in
+--- k3b-1.0.5.orig/plugins/decoder/musepack/configure.in.in	2008-05-27 11:23:36.000000000 +0300
++++ k3b-1.0.5/plugins/decoder/musepack/configure.in.in	2009-07-26 18:00:10.000000000 +0300
+@@ -14,13 +14,13 @@
+ 
+   dnl - search for both the new and the old naming -
+ 
+-  KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
+-  	AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
++  KDE_CHECK_HEADERS(mpcdecsv7/mpcdec.h, [
++  	AC_CHECK_LIB(mpcdecsv7, mpc_decoder_setup, [
+   		have_mpc=yes
+-		MPC_LIBS="-lmpcdec"
++		MPC_LIBS="-lmpcdecsv7"
+ 		AC_DEFINE(
+ 			MPC_HEADER_FILE, 
+-			<mpcdec/mpcdec.h>, 
++			<mpcdecsv7/mpcdec.h>, 
+ 			[The header to include for MPC decoding.])
+ 		],
+ 		[], [], [])
diff --git a/kde-apps/k3b/files/k3b-1.0.5-transcode-1.1.patch b/kde-apps/k3b/files/k3b-1.0.5-transcode-1.1.patch
new file mode 100644
index 00000000..dd749818
--- /dev/null
+++ b/kde-apps/k3b/files/k3b-1.0.5-transcode-1.1.patch
@@ -0,0 +1,18 @@
+--- k3b-1.0.5.orig/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2008-05-27 10:24:20.000000000 +0200
++++ k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009-05-19 18:30:07.211821502 +0200
+@@ -206,10 +206,13 @@ void K3bVideoDVDTitleTranscodingJob::sta
+     *d->process << "--nice" << "19";
+ 
+   // we only need 100 steps, but to make sure we use 150
++  int progressRate = ( int )m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150;
++  if ( progressRate < 1)
++      progressRate = 1;
+   if ( d->usedTranscodeBin->version.simplify() >= K3bVersion( 1, 1, 0 ) )
+-      *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
++      *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(progressRate);
+   else
+-      *d->process << "--print_status" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
++      *d->process << "--print_status" << QString::number(progressRate);
+ 
+   // the input
+   *d->process << "-i" << m_dvd.device()->blockDeviceName();