gentoo resync : 31.05.2021

4 files changed, 2 insertions, 166 deletions

diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 31f626c41487..f006dcc31203 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,7 +1,4 @@
-AUX 3.34.1-gst-inspect-sandbox.patch 1828 BLAKE2B 9abd87afc62c784c4e5f79374d0172da0295cee520a9aa3ce2d4a2471f3e94accd7f14746fb93873767a5a11a2c9143b9387bf70295cc792199df62f501f73de SHA512 c312ddee62695b4344917eb2c7cca67284f3c7b24b21f35646f8b315bded9827aec05056fd17eadfe35da3dd876f20fd7b2cadd2141d04843c3c96d5f0346b21
 AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53
-DIST totem-3.34.1.tar.xz 2157160 BLAKE2B 9ae9c8f6485c7377af07803c328e8ea3cc6fa80d8e30a7045bd2b50f7bc3d5a12582e5b60d901d22683f89e994c619c26ddb8b0890e343c873d4457fa177786d SHA512 9a3556f5cf522fca29926db185c2e5d25bdb80a25e14d0ba3062a7f15fc3ec40ae9f25752763bc444d4fd82ec2098efd732da662a1b1c5923ec19fde432606db
 DIST totem-3.38.0.tar.xz 2235672 BLAKE2B 31a69bce69316e06b6ba1b1c98bfc5b87cae0b30e682bb1b32bbac713fb2ff262084e76c19690eb78495969a67c2be484bc45adcd1b432a3de7a33c3dc04109c SHA512 231aca873bb53f23f81a7981177761d0bf7768baa845309b0dc0821db58377d692cf7e8a65135090dac14e856aa3e1dc0c1f11c55a7b25d694822019bfa9eecf
-EBUILD totem-3.34.1-r1.ebuild 2789 BLAKE2B 615ed5d9dcb1c2852c7c3c0592bd40d9585ee3f0061bf6340c226a9feb60b89fac8f7cadb2121bf9bdd6aa3e96fa52331a783ba6c88ab088b989d7209312417e SHA512 fddc185417f9d27b097cfe56847ee39b369ed1df6d4b9ab18cccc37f2073f81f82c1f82481e9906d256e41c9569d93753cc826dd835fcc5705899499879a0c05
-EBUILD totem-3.38.0.ebuild 2790 BLAKE2B 8ec2c830521636e99084f30cf8d31aa9684ace498bb2601129f24d1b1ee6fe68030a271d260e0fdb5c9960e64641dc6861c55ece1cb070cfdaa49b2469211695 SHA512 ecbd39ef76d91afb54b2ec5ebd27a298d2e3cc14a69cf7486933a67e178df06732c55eda3fb316bd0b7104695b69b54ec3deb64ab2aeae537191a6af2e2fe7ce
+EBUILD totem-3.38.0.ebuild 2788 BLAKE2B a510d93af942297fe1dde5835caad6a2cd5dc04f90d7314f3d02dae0b64c3fb6fec45894034e0b958e3d6d6968852a0bae5b9b8609a9bd456d8c8b98e9d35fd2 SHA512 ddd5ea038d0e5158689ecf67998b32ad0989ea3f2fe69dc4b1bdc0a0fd6f43de7a21d2bfe65ce095e5678b576bc35d1c630ad3c69801f11d32f949e56011b944
 MISC metadata.xml 1017 BLAKE2B de40f52bc4cc3c838b473d4c444e9c41673cd3c2925f17508d03f5130fe237784d4ee4d02581718c06ccd30fa204d27ba7691fb8046009a540c00f3535f6909d SHA512 9b89a8eaa90ad2f55abf7a53bfba7c065be999233a7bbfe243f4514ca1c3ec5a3934f23ea8ecd6b2674ac82d5e55e2f3e25e3869a0cec019485c9bb99549b625
diff --git a/media-video/totem/files/3.34.1-gst-inspect-sandbox.patch b/media-video/totem/files/3.34.1-gst-inspect-sandbox.patch
deleted file mode 100644
index 01ee15f8349d..000000000000
--- a/media-video/totem/files/3.34.1-gst-inspect-sandbox.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2108ed8d025499fbf11dfe750ebc7617bdbb795a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Thu, 7 Jun 2018 23:47:48 +0200
-Subject: [PATCH] Make gst-inspect calls optional at build-time
-
-Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed
----
- meson_options.txt       | 1 +
- src/backend/meson.build | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index d6f8b4290..c8db92335 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -2,3 +2,4 @@ option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', '
- option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support')
- option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
- option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
-+option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins')
-diff --git a/src/backend/meson.build b/src/backend/meson.build
-index 7a63bab1b..5c4ebb996 100644
---- a/src/backend/meson.build
-+++ b/src/backend/meson.build
-@@ -1,5 +1,6 @@
- backend_inc = include_directories('.')
- 
-+if get_option('gst-inspect')
- gst_inspect = find_program(
-   'gst-inspect-1.0',
-   join_paths(gst_dep.get_pkgconfig_variable('toolsdir'), 'gst-inspect-1.0'),
-@@ -31,6 +32,7 @@ foreach plugin: gst_good_plugins
-   assert(r.returncode() == 0,
-          'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.')
- endforeach
-+endif
- 
- sources = files(
-   'bacon-time-label.c',
--- 
-2.20.1
-
diff --git a/media-video/totem/totem-3.34.1-r1.ebuild b/media-video/totem/totem-3.34.1-r1.ebuild
deleted file mode 100644
index 94346eec82b5..000000000000
--- a/media-video/totem/totem-3.34.1-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="gtk-doc +python test"
-# see bug #359379
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.19.4:3[introspection]
-	>=media-libs/gstreamer-1.6.0:1.0
-	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
-	>=media-libs/gst-plugins-good-1.6.0:1.0
-	>=media-libs/grilo-0.3.0:0.3[playlist]
-	>=dev-libs/libpeas-1.1.0[gtk]
-	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection]
-	>=media-libs/clutter-1.17.3:1.0[gtk]
-	>=media-libs/clutter-gst-2.99.2:3.0
-	>=media-libs/clutter-gtk-1.8.1:1.0
-	gnome-base/gnome-desktop:3=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/gobject-introspection-1.54:=
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	media-plugins/grilo-plugins:0.3
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		x11-libs/pango[introspection]
-		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	dev-lang/perl
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.5 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-# perl for pod2man
-# Prevent dev-python/pylint dep, bug #482538
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Drop pointless samplepython plugin from build
-	sed -e '/samplepython/d' -i src/plugins/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable-easy-codec-installation=yes
-		-Denable-python=$(usex python yes no)
-		-Dwith-plugins=all # in 3.34.1 only builtin and python plugins are left, and python is extra controlled by enable-python
-		$(meson_use gtk-doc enable-gtk-doc)
-		-Dgst-inspect=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use python ; then
-		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/media-video/totem/totem-3.38.0.ebuild b/media-video/totem/totem-3.38.0.ebuild
index 89b5506cb674..8370cbd704d1 100644
--- a/media-video/totem/totem-3.38.0.ebuild
+++ b/media-video/totem/totem-3.38.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2