public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
Date: Mon, 27 Apr 2015 15:58:13 +0000 (UTC)	[thread overview]
Message-ID: <1430150270.06c6632e2ba8e916de679489250cae590541527c.kensington@gentoo> (raw)

commit:     06c6632e2ba8e916de679489250cae590541527c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 15:57:50 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 15:57:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=06c6632e

[app-cdr/k3b] Migrate to new-style ffmpeg/libav USE flags.

Package-Manager: portage-2.2.18

 app-cdr/k3b/k3b-5.9999.ebuild | 7 +++++--
 app-cdr/k3b/k3b-9999.ebuild   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-cdr/k3b/k3b-5.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild
index 8e6423a..a0ac01c 100644
--- a/app-cdr/k3b/k3b-5.9999.ebuild
+++ b/app-cdr/k3b/k3b-5.9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
 KEYWORDS=""
-IUSE="dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
 	$(add_frameworks_dep karchive)
@@ -51,7 +51,10 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	flac? ( >=media-libs/flac-1.2[cxx] )
 	mp3? ( media-sound/lame )
 	mad? ( media-libs/libmad )

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index dacbb69..b2cd543 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -29,13 +29,16 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 KEYWORDS=""
 SLOT="4"
-IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
 	$(add_kdebase_dep libkcddb)
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 	flac? ( >=media-libs/flac-1.2[cxx] )
 	mp3? ( media-sound/lame )
 	mad? ( media-libs/libmad )


             reply	other threads:[~2015-04-28 14:42 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-27 15:58 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-12-14 11:27 [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/ Michael Palimaka
2016-08-31 14:41 Michael Palimaka
2016-08-18 17:22 Michael Palimaka
2016-08-18 12:48 Michael Palimaka
2016-07-29 22:26 Johannes Huber
2016-07-15 11:19 Johannes Huber
2016-04-04 17:46 Johannes Huber
2016-03-28 12:24 Johannes Huber
2016-01-13 18:19 Michael Palimaka
2016-01-04 16:21 Michael Palimaka
2015-09-14 13:17 Michael Palimaka
2015-06-27 21:11 Johannes Huber
2015-06-27 20:44 Johannes Huber
2015-02-12 22:43 Johannes Huber
2014-11-24 12:48 Michael Palimaka
2014-09-14 19:25 Johannes Huber
2014-09-09 16:34 Michael Palimaka
2014-09-09 16:31 Michael Palimaka
2014-09-09 16:31 Michael Palimaka
2013-06-27 21:04 Johannes Huber
2012-09-11 13:45 Michael Palimaka
2012-08-25 15:41 Michael Palimaka
2012-05-23 22:01 Maciej Mrozowski
2012-05-23 20:00 Michael Palimaka
2012-05-22 21:37 Michael Palimaka
2012-05-19 18:08 Michael Palimaka
2011-08-12 22:37 Maciej Mrozowski
2011-08-10 22:00 Andreas Hüttel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1430150270.06c6632e2ba8e916de679489250cae590541527c.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox