[gentoo-commits] repo/gentoo:master commit in: media-libs/libquicktime/, media-libs/libquicktime/files/

[Andreas Sturmlechner]

commit:     d8a4ee0263c4c38242fa751a779b8c5ec3bf3d5c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 14:49:30 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 15:07:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a4ee02

media-libs/libquicktime: EAPI-7 bump

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 ...atch => libquicktime-1.2.4-CVE-2016-2399.patch} |  0
 .../libquicktime/libquicktime-1.2.4-r2.ebuild      |  2 +-
 ....2.4-r2.ebuild => libquicktime-1.2.4-r3.ebuild} | 30 +++++++++++-----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/media-libs/libquicktime/files/CVE-2016-2399.patch b/media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch
similarity index 100%
rename from media-libs/libquicktime/files/CVE-2016-2399.patch
rename to media-libs/libquicktime/files/libquicktime-1.2.4-CVE-2016-2399.patch

diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
index 7153bd3006a..32f2d0f169e 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
@@ -57,7 +57,7 @@ DOCS=( ChangeLog README TODO )
 PATCHES=(
 	"${FILESDIR}"/${P}+libav-9.patch
 	"${FILESDIR}"/${P}-ffmpeg2.patch
-	"${FILESDIR}"/CVE-2016-2399.patch
+	"${FILESDIR}"/${P}-CVE-2016-2399.patch
 )
 
 src_prepare() {

diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
similarity index 87%
copy from media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
copy to media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 7153bd3006a..69f1b64818e 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit libtool multilib-minimal
 
@@ -11,20 +11,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 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:=
+RDEPEND="
+	sys-libs/zlib
+	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
 	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? (
-		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+		libav? ( >=media-video/libav-12:0=[${MULTILIB_USEDEP}] )
+		!libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
 	)
 	gtk? ( x11-libs/gtk+:2 )
 	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
@@ -35,16 +36,17 @@ RDEPEND=">=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
 	vorbis? (
 		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
 		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		)
+	)
 	X? (
 		x11-libs/libX11
 		x11-libs/libXaw
 		x11-libs/libXext
 		x11-libs/libXt
 		x11-libs/libXv
-		)
+	)
 	x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
@@ -57,15 +59,13 @@ DOCS=( ChangeLog README TODO )
 PATCHES=(
 	"${FILESDIR}"/${P}+libav-9.patch
 	"${FILESDIR}"/${P}-ffmpeg2.patch
-	"${FILESDIR}"/CVE-2016-2399.patch
+	"${FILESDIR}"/${P}-ffmpeg29.patch
+	"${FILESDIR}"/${P}-CVE-2016-2399.patch
 )
 
 src_prepare() {
 	default
-	if has_version '>=media-video/ffmpeg-2.9' ||
-		has_version '>=media-video/libav-12'; then
-			eapply "${FILESDIR}"/${P}-ffmpeg29.patch
-	fi
+
 	if has_version '>media-video/ffmpeg-3.5' ; then
 		eapply "${FILESDIR}/${P}-ffmpeg4.patch"
 	fi