gentoo resync : 15.01.2020

3 files changed, 3 insertions, 36 deletions

diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index 88fa8756e213..95c784d3b96d 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-gtk-1.14.4.ebuild 1176 BLAKE2B f074238fc9105b6a0557a7c732f8a2ad21f26dbe0914cf1f14f30a947cf73527ea4ba77d63cf545b5edc61bbdaebc389f96a30bdc701bd53be0659546b80450c SHA512 627cef73b725d8c5e10fe85692560fa39e88383a261f123d5641fe87cf8fb509aa34db9049a152f8c7c574666d7e71038efdb4c4d086afad253d3f20401a3187
-EBUILD gst-plugins-gtk-1.14.5.ebuild 1178 BLAKE2B 927107813653006b8713ada48f4cc0737597792ed1cb917aa4f75e22840044d097b59f83c36d77ce24db7c28b3a447fdfae7b48047f2bbfd4e8314c03d962b89 SHA512 41dcf428e39ab0851be29b6864d68f90895cd57a2680b9a519eb666736c0ac5c5f4b77051200435b2e1222d25bf92e7af9e860a74a7b82f02337361911d18759
+EBUILD gst-plugins-gtk-1.14.5.ebuild 1176 BLAKE2B 26123f5c13983a7ef104ea26958e1d4fa89fda0221c94e3beb63e81e249df041c976c07b3c7b72535d7f673dfea707eac01f054d571dec5dcf0b5e162d6f30fc SHA512 904eaec8c158ac2998a7f631bb1300563b0682756b0fea612f25eaac360afe7a98ec76cb4da9a7c4f6707528dd1111ce09970a828cb50cd83258aaafb22e7c35
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
deleted file mode 100644
index 7748187d482e..000000000000
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit gstreamer
-
-DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
-# egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
-# We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
-# we don't care about matching egl/wayland/X if both opengl and gles2 are disabled here and on
-# gst-plugins-base, but no way to express that.
-
-# We only need gtk+ matching backend flags when GL is enabled
-GL_DEPS="
-	>=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl=,gles2=,opengl=,wayland=,X=]
-	>=x11-libs/gtk+-3.15:3[${MULTILIB_USEDEP}]
-	gles2? ( ${GL_DEPS} )
-	opengl? ( ${GL_DEPS} )
-
-	!<media-libs/gst-plugins-bad-1.13.1:1.0
-"
-DEPEND="${RDEPEND}"
-
-GST_PLUGINS_BUILD="gtk3"
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
index 16d6d9e120bd..5376bd8fa863 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;