From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXJcq-00058z-8d for garchives@archives.gentoo.org; Wed, 23 May 2012 22:01:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 799EBE073B; Wed, 23 May 2012 22:01:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 340EBE073B for ; Wed, 23 May 2012 22:01:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 213191B4026 for ; Wed, 23 May 2012 22:01:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E9E46E542A for ; Wed, 23 May 2012 22:01:35 +0000 (UTC) From: "Maciej Mrozowski" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Mrozowski" Message-ID: <1337810392.3202c37f0b37f5757994e2ade3fd44318b302ac9.reavertm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/ X-VCS-Repository: proj/kde X-VCS-Files: app-cdr/k3b/k3b-9999.ebuild app-cdr/k3b/metadata.xml X-VCS-Directories: app-cdr/k3b/ X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski X-VCS-Revision: 3202c37f0b37f5757994e2ade3fd44318b302ac9 X-VCS-Branch: master Date: Wed, 23 May 2012 22:01:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9c44884d-c263-4a79-b303-ddfb5a5ec4c2 X-Archives-Hash: 8a81b5caa44ff7e89be779698748b6d4 commit: 3202c37f0b37f5757994e2ade3fd44318b302ac9 Author: Maciej Mrozowski gentoo org> AuthorDate: Wed May 23 21:59:52 2012 +0000 Commit: Maciej Mrozowski gentoo org> CommitDate: Wed May 23 21:59:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D3202c37f [app-cdr/k3b] Sync with tree. Remove encode and wav USE flags --- app-cdr/k3b/k3b-9999.ebuild | 26 ++++++++------------------ app-cdr/k3b/metadata.xml | 1 - 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild index aa78058..ceae714 100644 --- a/app-cdr/k3b/k3b-9999.ebuild +++ b/app-cdr/k3b/k3b-9999.ebuild @@ -28,9 +28,9 @@ DESCRIPTION=3D"The CD/DVD Kreator for KDE" HOMEPAGE=3D"http://www.k3b.org/" =20 LICENSE=3D"GPL-2 FDL-1.2" -SLOT=3D"4" KEYWORDS=3D"" -IUSE=3D"debug dvd emovix encode ffmpeg flac lame mad musepack sndfile so= x taglib vcd vorbis +wav" +SLOT=3D"4" +IUSE=3D"debug dvd emovix ffmpeg flac lame mad musepack sndfile sox tagli= b vcd vorbis" =20 DEPEND=3D" $(add_kdebase_dep libkcddb) @@ -52,7 +52,7 @@ RDEPEND=3D"${DEPEND} virtual/cdrtools dvd? ( >=3Dapp-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=3D( src_configure() { mycmakeargs=3D( -DK3B_BUILD_API_DOCS=3DOFF + -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=3DON -DK3B_BUILD_K3BSETUP=3DOFF + -DK3B_BUILD_WAVE_DECODER_PLUGIN=3DON -DK3B_ENABLE_HAL_SUPPORT=3DOFF -DK3B_ENABLE_MUSICBRAINZ=3DOFF $(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+=3D( - $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) - ) - else - mycmakeargs+=3D( - -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=3DOFF - ) - fi - kde4-base_src_configure } =20 diff --git a/app-cdr/k3b/metadata.xml b/app-cdr/k3b/metadata.xml index 9ba1d92..3ff95ab 100644 --- a/app-cdr/k3b/metadata.xml +++ b/app-cdr/k3b/metadata.xml @@ -5,6 +5,5 @@ media-optical Enable burning support for eMoviX images - Enable support for reading WAVE files