[app-cdr/k3b] Update to match in-tree version's deps

3 files changed, 16 insertions, 39 deletions

diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index c9e9fab351d..a7479f8d39d 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,3 +1,2 @@
-AUX k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch 493 RMD160 146162f40fffe127ae29ce215aa15d0fc76eed16 SHA1 307d466477ab0a367322ebd7f3592de6b9815e76 SHA256 b99be0f50afcf779b46af5b5e17f9716fb1e61127b42eb5cebd022921a2342b0
-EBUILD k3b-9999-r1.ebuild 2911 RMD160 5ad091bec4b5b7e1b04656cbaee1033e739adcd5 SHA1 14559c8a33c35eb7fb4ba0556eb0f46bef85bf4f SHA256 418018065b072233b5f8118f582cbddf3fc25b11d9a71870d8d120f4e4a57e29
+EBUILD k3b-9999-r1.ebuild 2630 RMD160 b00652f8c8b1be91be2ba994454b9c173cc23ed1 SHA1 b12f1a02c9de2433df987f52634ae10f98372fe3 SHA256 c454eb7052e0acdab94f9db5da55441e86fb349193ac37b3a7436d671ceb7855
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
diff --git a/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch b/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch
deleted file mode 100644
index ba10ae27250..00000000000
--- a/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- k3b-1.66.0.orig/cmake/modules/FindMuse.cmake
-+++ k3b-1.66.0/cmake/modules/FindMuse.cmake
-@@ -20,8 +20,8 @@ FIND_PATH(MUSE_INCLUDE_DIR NAMES mpcdec/
- )
- 
- if(MUSE_INCLUDE_DIR)
--  FIND_LIBRARY(MUSE_LIBRARIES NAMES mpcdec)
--  set(MPC_HEADER_FILE "<mpcdec/mpcdec.h>")
-+  FIND_LIBRARY(MUSE_LIBRARIES NAMES mpcdecsv7 )
-+  set(MPC_HEADER_FILE "<mpcdecsv7/mpcdec.h>")
- else(MUSE_INCLUDE_DIR)
-   FIND_PATH(MUSE_INCLUDE_DIR NAMES musepack/musepack.h)
-   set(MPC_HEADER_FILE "<musepack/musepack.h>")
diff --git a/app-cdr/k3b/k3b-9999-r1.ebuild b/app-cdr/k3b/k3b-9999-r1.ebuild
index 18c054b85b7..a50d3c2ee2f 100644
--- a/app-cdr/k3b/k3b-9999-r1.ebuild
+++ b/app-cdr/k3b/k3b-9999-r1.ebuild
@@ -2,49 +2,43 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=2
 
-WEBKIT_REQUIRED="always"
+WEBKIT_REQUIRED=always
 KMNAME="extragear/multimedia"
 inherit kde4-base
 
-DESCRIPTION="K3b, KDE CD Writing Software"
+DESCRIPTION="The CD/DVD Kreator for KDE"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS=""
-IUSE="debug dvd emovix encode ffmpeg flac mad lame musicbrainz musepack sndfile sox taglib vcd vorbis +wav"
+IUSE="debug dvd emovix encode ffmpeg flac mad lame musicbrainz sndfile sox taglib vcd vorbis +wav"
 
 DEPEND="
 	>=kde-base/libkcddb-${KDE_MINIMAL}
 	media-libs/libsamplerate
-	>=x11-libs/qt-gui-4.5.0
 	dvd? ( media-libs/libdvdread )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080206 )
-	flac? ( >=media-libs/flac-1.2.1-r2[cxx] )
-	encode? (
-		lame? ( media-sound/lame )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	flac? ( >=media-libs/flac-1.2[cxx] )
+	encode? ( lame? ( media-sound/lame ) )
 	mad? ( media-libs/libmad )
-	musepack? ( media-libs/libmpcdecsv7 )
 	musicbrainz? ( media-libs/musicbrainz:1 )
 	sndfile? ( media-libs/libsndfile )
 	taglib? ( >=media-libs/taglib-1.5 )
 	vorbis? ( media-libs/libvorbis )
 "
 RDEPEND="${DEPEND}
-	>=app-cdr/cdrdao-1.1.7-r3
-	>=media-sound/cdparanoia-3.9.8
+	app-cdr/cdrdao
+	media-sound/cdparanoia
 	virtual/cdrtools
 	dvd? (
-		>=app-cdr/dvd+rw-tools-7.0
+		>=app-cdr/dvd+rw-tools-7
 		encode? ( media-video/transcode[dvd] )
 	)
 	emovix? ( media-video/emovix )
-	encode? (
-		sox? ( media-sound/sox )
-	)
+	encode? ( sox? ( media-sound/sox ) )
 	vcd? ( media-video/vcdimager )
 	!app-cdr/k3b:0
 	!app-cdr/k3b:2
@@ -52,11 +46,7 @@ RDEPEND="${DEPEND}
 
 DOCS="FAQ KNOWNBUGS PERMISSIONS"
 
-# Fix musepack support, libmpcsv7 needed
-PATCHES=( "${FILESDIR}/${PN}-1.66.0_alpha2-fix-musepack-lib-detection.patch" )
-
 src_configure() {
-	# Common settings
 	mycmakeargs="${mycmakeargs}
 		-DK3B_BUILD_K3BSETUP=OFF
 		$(cmake-utils_use debug K3B_DEBUG)
@@ -67,13 +57,14 @@ src_configure() {
 		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
-		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
+		-DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF
 		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
 		$(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)"
+		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+		-DWITH_PolkitQt=OFF
+	"
 
-	# Encoder settings
 	if use encode; then
 		mycmakeargs="${mycmakeargs}
 			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)