gentoo resync : 17.12.2017

3 files changed, 2 insertions, 78 deletions

diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 10299b44ca97..cd39a8933855 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,7 +1,5 @@
-DIST gst-libav-1.10.4.tar.xz 8535052 BLAKE2B ba3fcdea028fc5b560f3ef053b1a618929db27ba5c4fba3e9aa49f4c0f0eb602d04f8b4bacb3448ae412fb08f4cd3f2fe9f687b126ebc6bab8c983c07ab09e81 SHA512 4037c4651c9f4c0e677f1f8136194c16319507dec3992270c1f98d461a69a55653d261ade45add833103872455e09c30695318181e81242ce78d1c2a2b95ca9c
 DIST gst-libav-1.10.5.tar.xz 8545300 BLAKE2B 02a747bc7f75e5757d918f8f5213a47be3bb0eb67558a30973f02f5b964c2de51c8737aa7d7e74b11f91128830c8f004ef8493671ff0d49ce5e098ee8139240c SHA512 a0636a3b32a5c20eba69a0002fc549facebb0211774e13dd526a3a1eb710f3342662179af6275d619d5075ad0f6dc7068b9950cfb0c60e3ad48249475b39216b
 DIST gst-libav-1.12.3.tar.xz 8791724 BLAKE2B 1d69be6a581d00ad939c1d35dd6913f03a816d7daee579a00fa3c39a2d936a3dbecfa576e98243fd2db4d3e76d9fa9b7b3799a00223436621606ba134a90c85e SHA512 33b380b7094afe1db57103eeeca5ae13db98a5bee6785f884a7ec8abb93a94f702eb52f0515f4fa27a0f157ecb0757cf3576df335dc456254f9a82567f5ab7a8
-EBUILD gst-plugins-libav-1.10.4.ebuild 2151 BLAKE2B de2d383d6a29e79f5ec2f8d88062bfc6e7fa4dd9c27e2f6e055f141e52a3ed8f899d4c96a8b02d77bf988153d2ed702727fd8025a825fc00fa0560e6c26c4687 SHA512 b6e4d6d20843ec2855c2890f1c7f3733f57766c6b05aadbd97e20b8d115b89995c39ef048180136ea298fef5a1c9b0a9629d8240c227009c2aff2fe04aad3c34
 EBUILD gst-plugins-libav-1.10.5.ebuild 2159 BLAKE2B 1c040941a37425c37a55d9e0264cd1ff5433238deb0a01857f53c8cf9a8bab8d05f56383427586186fc44c931b6c0f3119ca605fabf3718fdb3cf0d2637ee1de SHA512 da0df02502a3434bf9b4a961c86c6f7b6611dcefb74a8a7eca815bb5a08bc21ad557f6f2d38839a0f19d10836a14a043bfa821eb8b75c705a46297106db23f8e
-EBUILD gst-plugins-libav-1.12.3.ebuild 2160 BLAKE2B a22936d1603fa6e2172cb7fd82413e67abe845cc9553ab9116775eb68b55d41f6fb9bf861e49bd6d8636fbf085fa82feec8047bacc0dfb1445d3def1bc187c72 SHA512 e0aa98386d08fcf812ff44682c6e1f22ebadeb20d4a1e35cc3b7b9bb69a89b769fd98e56e60649f7ad076abda34e2d0f2883677f5e9e7276cbdc963a56eca0f9
+EBUILD gst-plugins-libav-1.12.3.ebuild 2159 BLAKE2B 132dd8b8f2ead80e9e235c63ee05e7a203544d3d5a5b4da0231b6fd871972743b3aa926c190e3b0c31f2796f12522f93c46ef57448592d9b406122435f4a6f6b SHA512 13b4350026724429d05f5a5b268345183f0bb22204a6a0b51732591bb8efd1fbf7090566a11a6ac71dcf3096eae9376f94a5015ccecebde75acf06007b90dd53
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.4.ebuild
deleted file mode 100644
index a4502f4ce490..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.10.4.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 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.10.3:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.10.3: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.12.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.12.3.ebuild
index 16d6e0eb42a7..9fd76d17cba5 100644
--- 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
@@ -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"
 
 # XXX: bzip2/lzma are automagic