gentoo resync : 18.11.2018

3 files changed, 2 insertions, 135 deletions

diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 9c06f0817c30..01ee55894381 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -5,6 +5,5 @@ AUX libquicktime-1.2.4-ffmpeg2.patch 4046 BLAKE2B 1db6a761fa94a32741a05919d12d02
 AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52706413c1ffd88d8645de7359ec26f7059101ab81ac135cf7ef707a8acbeb709e1a6dae03d6a7e7f70c7e88185ebb271acbe4 SHA512 2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r2.ebuild 3879 BLAKE2B b464fdd272c974633dec17eadd38dc0f295ba81a63f8233d55767b63e31e0bba7670f27a8e04f47ecb8f367702249621834eac6f4a7346b41fa188fd67908d86 SHA512 4c5c9bb52ad4826871f7acb45fb00c90e603465084dd375b85b07a412dd59c43b9aab791350d14579d1dd29476389fa49d4a98fb4a517a595aa396add5e0e529
-EBUILD libquicktime-1.2.4-r3.ebuild 3841 BLAKE2B a00f1682c929b9e3b22b2a63bee72b3fd465de17cc78281a4c55e5316a51e0041b55f16b5659a6f629e9ec64bebf0cd285ba4fac9b2bb69bec690d28221dddae SHA512 b57517fda9b4a2f42495b1382a539c211f416cc8b976ea46862128c3f2549819ac12d7a09e765e7a609ed49e497766c3f85986fcb4f4bd7ae1194f736e285ed9
+EBUILD libquicktime-1.2.4-r3.ebuild 3840 BLAKE2B 633c30ac92fd324dde8cfcfa2787dda46534d4c18a8fc112d326ea370b29bdeda9bf4ceeb85fab61491a54a6a148e0ee30ca8d1cf6f2756008567be4c7cce789 SHA512 57849579e28b0256ce2ab4e4bc74b305ace9357e87b78a56860cc9a65c6c19a4bc3ea272c38f279a52577977aaf2962f700d4ecae69d8286ec2212fe4a77440f
 MISC metadata.xml 506 BLAKE2B 2b6f16d304beace7cb71ac32cc734ec4bf0e28c2b155068f9c5f83fc9a5a8731056ec1b3743da9f2b6add73f4b82d4fb797dad913451ea255ab5752557f7b2eb SHA512 80ee7f91a4fafe6a9f9380bab5236633672484dea9389ab5b391319fbcbe010607903b21c12c37211575f4e55251f1718c2000225226fd0a63183ac903817ce1
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
deleted file mode 100644
index 32f2d0f169e1..000000000000
--- a/media-libs/libquicktime/libquicktime-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="An enhanced version of the quicktime4linux library"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-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"
-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? (
-		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}] )
-	opengl? ( virtual/opengl )
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-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}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="opengl? ( X )"
-
-DOCS=( ChangeLog README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}+libav-9.patch
-	"${FILESDIR}"/${P}-ffmpeg2.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
-
-	local x
-	for x in lqt_ffmpeg.c video.c audio.c ; do
-		sed -i -e "s:CODEC_ID_:AV_&:g" "plugins/ffmpeg/${x}" || die
-	done
-
-	elibtoolize # Required for .so versioning on g/fbsd
-}
-
-multilib_src_configure() {
-	# utils use: alsa, opengl, gtk+, X
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-gpl \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_mmx asm) \
-		$(multilib_native_use_with doc doxygen) \
-		$(use vorbis || echo --without-vorbis) \
-		$(use_with lame) \
-		$(multilib_native_use_with X x) \
-		$(multilib_native_use_with opengl) \
-		$(multilib_native_use_with alsa) \
-		$(multilib_native_use_with gtk) \
-		$(use_with dv libdv) \
-		$(use_with jpeg libjpeg) \
-		$(use_with ffmpeg) \
-		$(use_with png libpng) \
-		$(use_with schroedinger) \
-		$(use_with aac faac) \
-		$(use encode || echo --without-faac) \
-		$(use_with aac faad2) \
-		$(use_with x264) \
-		--without-cpuflags
-
-	if ! multilib_is_native_abi; then
-		# disable building utilities
-		sed -i -e '/SUBDIRS =/s:utils::' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	# Compatibility with software that uses quicktime prefix, but
-	# don't do that when building for Darwin/MacOS
-	[[ ${CHOST} != *-darwin* ]] && dosym /usr/include/lqt /usr/include/quicktime
-}
-
-pkg_preinst() {
-	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-		elog "For compatibility with other quicktime libraries, ${PN} was"
-		elog "going to create a /usr/include/quicktime symlink, but for some"
-		elog "reason that is a directory on your system."
-
-		elog "Please check that is empty, and remove it, or submit a bug"
-		elog "telling us which package owns the directory."
-		die "/usr/include/quicktime is a directory."
-	fi
-}
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index 2940148b855b..3271cf10dd32 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ 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="