gentoo resync : 21.07.2018

3 files changed, 2 insertions, 78 deletions

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 9ac3cc24c39e..78994e5dcf68 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,7 +1,5 @@
-DIST gst-libav-1.12.3.tar.xz 8791724 BLAKE2B 1d69be6a581d00ad939c1d35dd6913f03a816d7daee579a00fa3c39a2d936a3dbecfa576e98243fd2db4d3e76d9fa9b7b3799a00223436621606ba134a90c85e SHA512 33b380b7094afe1db57103eeeca5ae13db98a5bee6785f884a7ec8abb93a94f702eb52f0515f4fa27a0f157ecb0757cf3576df335dc456254f9a82567f5ab7a8
 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
-EBUILD gst-plugins-libav-1.12.3.ebuild 2158 BLAKE2B b11928ea20efcd064a9d8c0a9e076e1b6c6ab716347fe519b68c919e384d692954a65a9a2557f08600e8164bee7147bf18978e1428050d957164a464132e8219 SHA512 1372c442de3915736ed162a3c852dc39b22b5c5cbc86e0ffd5c0e33aeb3f0c462751b3b4dd077cbf7e022001c36aeea0ed891015b0f78c5ddd8cf4c4e048f21f
 EBUILD gst-plugins-libav-1.12.4.ebuild 2040 BLAKE2B f26b629d3cd4aa596f597edbb598044f9589379b5721a52e683eab0894d9a38751bf41f53224d9401a55d9afd05d60eb7b44fd3aaef55ac1c67f335271f8077d SHA512 87556338c9b5defa43c6e418f1174d275ed1bd490960f72de2e28940ebb78cc04a59a335ce162d9ae61f325928ba8d707c4b39988e67e143e2c72aee82d961ee
-EBUILD gst-plugins-libav-1.14.1.ebuild 2070 BLAKE2B 201131266a3f467e0652462ed49988cf0f1f9b52552b57d250af724b279d8a29121a7b4b0cd02ae3c935109daa93576795add52e3e6822d81fbec9fea87c7496 SHA512 dee1611f038bfb321a77784046178fd7bc627f0063c3eccc532884673d1ee39526c24709b6127f81b55d32883ef3035318995956db7bedfc780e88dc47d2da4d
+EBUILD gst-plugins-libav-1.14.1.ebuild 2068 BLAKE2B 78b0a5ba4f9416c9351014a6f5b9fb561070cf3ae4fd2c7d903a06d7547490215af75365c54cd00f0ea1ec98cfce0d76c1ad2fa7a6fe97f392dc66513933f2b2 SHA512 2eb35fbcb7233582321d5ea6ba4a4ec50c35468082dfd4aec183a5db2036bc4e58483d0e34a918651d4a3a17cf9bed75908dba75c82ee9f42928053ad44af00f
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.3.ebuild
deleted file mode 100644
index ce42ea314b50..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 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
-# Move back to ${PV} deps of gstreamer/gst-plugins-base later; 1.10.4 had it reduced for lone security stabilization
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/gstreamer-1.12.0:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.12.0:1.0[${MULTILIB_USEDEP}]
-	!libav? ( >=media-video/ffmpeg-3.2.4: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 178d90e9649e..21bed5addaee 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="