Remove encode and wav USE flags.

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

3 files changed, 18 insertions, 29 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index efaccddf6d87..01241cb1146a 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.272 2012/05/23 18:59:56 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.273 2012/05/23 21:52:24 reavertm Exp $
+
+  23 May 2012; Maciej Mrozowski <reavertm@gentoo.org> k3b-2.0.2-r3.ebuild:
+  Remove encode and wav USE flags.
 
   23 May 2012; Michael Palimaka <kensington@gentoo.org> k3b-2.0.2-r3.ebuild:
   Remove REQUIRED_USE in favour of letting affected use flags work on their own.
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index ffb1f8a99d51..93800be42e21 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -5,17 +5,13 @@ AUX k3b-2.0.2-ffmpeg.patch 3298 RMD160 0e7cff12151cfa33f87f4d4d425921e01fd1a9ba
 AUX k3b-2.0.2-libavformat54.patch 917 RMD160 5cf3edb1bb46ceee8ff6c47fd8342e044488d40e SHA1 5b35bff3f7670686a32bd71afea2deaca4331631 SHA256 516efa7ad0d9806c603f761769f8d1457fe9fa047a7475e7f11615db89ee1271
 DIST k3b-2.0.2.tar.bz2 12833321 RMD160 a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 SHA1 8b30a4d07942e82559b01bc07dea6bcf2defd532 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd
 EBUILD k3b-2.0.2-r1.ebuild 3412 RMD160 bd84124d0d845017c79a930d30105381e2f20d4d SHA1 1226cf144b964ee0025fd029b445c7e1e450bbd9 SHA256 fdc5088812ef0d71b0ae2de0705318fb907e08c8da80316a6dcaf4149fd95cee
-EBUILD k3b-2.0.2-r3.ebuild 3350 RMD160 068545df3860a4206ad50c973d9dc17387af922f SHA1 895b57c2f88a7483cc0d9ef49d2a9cf24d3e7c99 SHA256 53bc3fcc06cf1a4a91b468168128967f9d2d9d83218f579355096156131ed1f8
-MISC ChangeLog 39775 RMD160 7b3ad5876e025712e4cf27b011c53300e21e866a SHA1 02b5013b09126279046a3411e4cf16174c6f74ea SHA256 a4823a11867e15a1e794e2fa072c941600f948c75add802e5b4e485395a64ce0
+EBUILD k3b-2.0.2-r3.ebuild 3165 RMD160 eb57957ea794817419f4cf0752c8783f73b7c2fe SHA1 9cbd842f67a28af9a010e8f0f87797c2cb630148 SHA256 e4a585906633ce214c3fb737773bc44b13709a64ff8d9bb4ae28c42821beef36
+MISC ChangeLog 39884 RMD160 3a7278a216b6c495d55f8d22fd1a75b1812fecae SHA1 0a5bf86e52eda495ed8287846097ce85f72804d4 SHA256 b021dc3420dc4b92d8e0220c97f2c82f2b4ed2e373473c3d30f4d93cfd34d040
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvTO6AAoJEMbwO6tnXQ0snMQH/RHRw7HaRmbKzlPRA4/4XKjH
-cuVjaKjexfEQal5Lbv8K4u33SMJhd5Ahv83+rcQoQZzFpJ5AkbN12cclCUnOJw7g
-M9CSdQ2JPqlkOq+AFdURXLElXp9bzRFvt+qjFtfV+luCgqpi3VUYKiqpJtPagpfQ
-ZfA7wPKyI1EEpghkqjs9uJ+ElVOVVBwRj0O4MyifpCkyr7H28qB9Gph76/DP4ijW
-hyUKrbYjS/MdYYL3SSsJ4w3U8SwSb1ZJ3QaqDFQeHU1ibUECOHlczs4XIc39/Upl
-0dMuwQZmLC+XFuZzsDM5Xgb2/x3FjL06P3iWBErMEb1QQSBu0ES5FCRmdGVDiHw=
-=cLqq
+iEYEARECAAYFAk+9W/sACgkQFuHa/bHpVdvA7gCfRm1XlyWgrcpBDT6JlR5NDq43
+LZEAnRO+7X+JPlFtPRNZs8T6qtZS7gj7
+=zrsM
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/k3b-2.0.2-r3.ebuild b/app-cdr/k3b/k3b-2.0.2-r3.ebuild
index 785cc05152be..b855ef8494a8 100644
--- a/app-cdr/k3b/k3b-2.0.2-r3.ebuild
+++ b/app-cdr/k3b/k3b-2.0.2-r3.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/k3b/k3b-2.0.2-r3.ebuild,v 1.2 2012/05/23 18:59:56 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r3.ebuild,v 1.3 2012/05/23 21:52:24 reavertm Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug dvd emovix encode ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis +wav"
+IUSE="debug dvd emovix ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
 	$(add_kdebase_dep libkcddb)
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 	virtual/cdrtools
 	dvd? (
 		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
+		media-video/transcode[dvd]
 	)
 	emovix? ( media-video/emovix )
 	sox? ( media-sound/sox )
@@ -69,34 +69,24 @@ PATCHES=(
 src_configure() {
 	mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
 		-DK3B_BUILD_K3BSETUP=OFF
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
 		-DK3B_ENABLE_HAL_SUPPORT=OFF
 		-DK3B_ENABLE_MUSICBRAINZ=OFF
 		$(cmake-utils_use debug K3B_DEBUG)
 		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
-		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
-		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
+		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
 		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
 		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
 		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
 		$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
-		$(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 	)
-
-	if use encode; then
-		mycmakeargs+=(
-			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
-		)
-	else
-		mycmakeargs+=(
-			-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=OFF
-		)
-	fi
-
 	kde4-base_src_configure
 }