gentoo resync : 21.09.2018

3 files changed, 2 insertions, 77 deletions

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 3db8c89dbcc3..5f2e483a4650 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,7 +1,5 @@
-DIST gst-libav-1.12.4.tar.xz 8792776 BLAKE2B 8feb2b6d6b8b0dd018d7e23718112aa803c054e344b190946e598f5af195a7f16c6b10191ff051d74e521b78fc478fcc62a38c4aa3cb5aac303a5b7a16cbda23 SHA512 80ef9b7e179c081996875e452f66a3c5124cb99b5439e15b6ed4edf43e7ed1821b56639eea0db24050f0d5291d2b67d59e884dd71ab9193b5d1820153976f879
 DIST gst-libav-1.14.1.tar.xz 9031916 BLAKE2B 4f8426fd0c91ca9dd99d4d3820cee852610e957b4836b248f285a0d89b202af907f5f5f0ddb0cf2562eca6fb032a45ebe7fe3e6cbe5198f6d6852297cfd08091 SHA512 368d794d88b20fc879178c1984186a9dda7f8717e2e6bc17bd2dcd67be6d9dd55220da617f9872c40a63f5c9b3d11713ff96c8dbb0e4ffffb196f9464aae43d2
 DIST gst-libav-1.14.2.tar.xz 9036096 BLAKE2B 68000c35a1c582c93ad1113941ce17e1c4212e79a5eae627a1c41fb22a9d8fe2d5bb5165abb3ee81e36938b8c0485e2b7ac5f4a4d59199e28cbe0b35d3d85ef3 SHA512 ce8e7eba57b14d522b90c94f933987659b7d6e58e66513b4b3f41a70354a3d0065bb6d077285ed56074aaddff65c3d1f1fa7fb17fb2f75e94fbe814dffa790de
-EBUILD gst-plugins-libav-1.12.4.ebuild 2040 BLAKE2B f26b629d3cd4aa596f597edbb598044f9589379b5721a52e683eab0894d9a38751bf41f53224d9401a55d9afd05d60eb7b44fd3aaef55ac1c67f335271f8077d SHA512 87556338c9b5defa43c6e418f1174d275ed1bd490960f72de2e28940ebb78cc04a59a335ce162d9ae61f325928ba8d707c4b39988e67e143e2c72aee82d961ee
-EBUILD gst-plugins-libav-1.14.1.ebuild 2066 BLAKE2B cebb7c733c15fe38464e9404b8a8dddc358501e81e3fc162e56b17ffc5727352463f911a66d4314af805d0b641c1fccb02ea4966dafc695d40ca53fafa2024cb SHA512 aeb170c7d288b333861c67f9b103dd98549471dcbb58dc4d18344708f8c4fbdce047b7b30a2816843e91048588ad28c24549c5d2aa5ba2a26920a09aaee8b403
+EBUILD gst-plugins-libav-1.14.1.ebuild 2063 BLAKE2B 6a3a1a99e4e554bfcad0c093796800d05394b9d047fe856067fd78376e99f95f8376e1773b8035205c509c6dd90125f5b442e60836acb8aaab62f1454a03c011 SHA512 db44819fa6a0b71f07cfe04618bf5737ba7f770ff922f2ffa503c8ea702f04ccb2bc88c2e75ebeb4dd0b55343526382880bfd42bf65a413c457dde5ae13c5abb
 EBUILD gst-plugins-libav-1.14.2.ebuild 2076 BLAKE2B d02d8e47f32d85f3d7747b42e9c66c745d2fdb4baeb71c94c315a5eb96e07d27b487adce08049a9ee117d0b8e644e147f6c866b341a147aec069941e5a0b8f63 SHA512 f837da63e773bd13ae0ac8f1a83efa7e13b28f5bc9d782dd596a2b47727e14b849057f2d6610422bf2e88afb32714a5a701a8851d44950ffddb992326bf1bdbd
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild
deleted file mode 100644
index d82ebcacc092..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-# XXX: bzip2/lzma are automagic
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RESTRICT="test" # FIXME: tests seem to get stuck at one point; investigate properly
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# Upstream dropped support for system libav and won't work
-	# for preserving its compat anymore, forcing us to rely on internal
-	# ffmpeg copy if we don't want to cause unresolvable blockers for
-	# libav setups.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758183
-	# Prefer system ffmpeg for -libav
-	local myconf
-
-	if use libav; then
-		ewarn "Using internal ffmpeg copy as upstream dropped"
-		ewarn "the support for compiling against system libav"
-		ewarn "https://bugzilla.gnome.org/show_bug.cgi?id=758183"
-	else
-		myconf="--with-system-libav"
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		$(use_enable orc) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild
index b048595c7671..2f7753d327a7 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libav +orc"
 
 RDEPEND="