media-libs/libquicktime: Convert to libav useflag and add missing zlib dep, bug ...

Package-Manager: Portage-2.3.4, Repoman-2.3.2

diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
index 9c182daf58e8b361fef10ab8906ea8aa183316fc..b31abf34887d5dbba76bc23e281a8fc033ba618e 100644 (file)
--- a/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,16 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
+IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png schroedinger static-libs vorbis X x264"
 
 RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
+       sys-libs/zlib:=
        aac? (
                >=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]
                encode? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
                )
        alsa? ( >=media-libs/alsa-lib-1.0.20 )
        dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-       ffmpeg? ( >=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}] )
+       ffmpeg? (
+               libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
+               !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+       )
        gtk? ( x11-libs/gtk+:2 )
        jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
        lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )