gentoo resync : 25.09.2019

3 files changed, 24 insertions, 29 deletions

diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index d9a156927094..10cd290e7860 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -4,6 +4,6 @@ AUX 3.30.0-vala-errormsg.patch 820 BLAKE2B 6b896371078f59b5e46efb28ccca56ef710cb
 AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
 DIST totem-3.30.0.tar.xz 3275852 BLAKE2B 9a5f97229a8aa6f7665c6d3e79dff48cfcce3caeab69510361ef3e9e1a107f7a56c66a5ae89ba3ae0a77d4b0ae8a16ac1f61e77278c82bf768e50009420110d0 SHA512 9d2e0a9e89358eea03404afd9353d18fa23afee7a34612912411ef10d4fb0b26ee02db002e6f8e05f68a333202d419f1e1a35188da23f87189e3093dac655742
 DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
-EBUILD totem-3.30.0.ebuild 3714 BLAKE2B 2bdd3294e8d1749afac2a268231f809070ce926705e8b8053b91f280200b8e5c24277081ccf5c0db8c260a20af9095b781822f9259e1ea273f9779eb5da02d3e SHA512 335e3719f373d739331eea050ffab25d15231763885f97651bcee1c4970339f5720d1eba7c4284abc9ed6f2db545f6f3aaf838b44f1f561a8eaa2a473382ab7b
-EBUILD totem-3.32.1.ebuild 3431 BLAKE2B ac935a22e936aff899dcd33cd0d69566559b1993d1d84dc2ae53d72d624d9738d94c2afdf9aea99d3bc4eedb127379aeefb53885cf0549cb8b6ae7d0ad293c9c SHA512 646b70a0283531d4599f7d6c6c052e4ab9593bf552476b6d766e94745abb535954038539d4afe319094e83a8d4ec6fe7fc4127d6903a95d9ac5fb52f640edc2f
+EBUILD totem-3.30.0.ebuild 3742 BLAKE2B 8e2f992b6a3e9baede4c4d36063aee266753fa3badd3bdb85d13db9daaa92bf9cff737411d2232cebf53907cfc3b96e394822211e0ca9e417a34c0f39cd867ea SHA512 3ebb6f56195aa9e03883886e4972e0028c51f1f8fc9c26892651d3ddae29f496de635390cd83e163a5e6f6b32f9a4fb3ae11c67eb41761e8eadc33dea5a10968
+EBUILD totem-3.32.1-r1.ebuild 3110 BLAKE2B eb249c13d246dc798bc218df09b48ed8490c1c4960a6e1899b0b1a1f20ad44751503db3dc2df7365efe333b34f31d36658073b7df6565c577c8ed54d1fb9a732 SHA512 3fff1db6c78ff7eb38816e2b61cb130e64c2f1a887d34c607e1bed7dceab612ec4f221ca3fca13b3f83d0e9cc2757a2e4050a18c8263317674f4b94ee5c76eb4
 MISC metadata.xml 1323 BLAKE2B 50a31cc1ea80714ce43b7434888c275acfea44b2231c500b20422ead6f248b3ccb0765909df4dd2c74c05aee333e294c599982037f91364efe77b1dad639c63e SHA512 95686fb2c0a601026587bc759548bc7b3798f7ed1347d34d2deb42a35ed5f424da7412ccb4b6d6fb50ca078855c32f1eb0485ffa4eec919baad7e19b899058be
diff --git a/media-video/totem/totem-3.30.0.ebuild b/media-video/totem/totem-3.30.0.ebuild
index 06cfd5eb1388..291623b00836 100644
--- a/media-video/totem/totem-3.30.0.ebuild
+++ b/media-video/totem/totem-3.30.0.ebuild
@@ -64,6 +64,7 @@ DEPEND="${COMMON_DEPEND}
 	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
 	dev-util/glib-utils
 	dev-util/itstool
+	>=dev-util/intltool-0.50.1
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	x11-base/xorg-proto
diff --git a/media-video/totem/totem-3.32.1.ebuild b/media-video/totem/totem-3.32.1-r1.ebuild
index 1046a2c110e9..b06daab34a8b 100644
--- a/media-video/totem/totem-3.32.1.ebuild
+++ b/media-video/totem/totem-3.32.1-r1.ebuild
@@ -1,32 +1,33 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python{3_5,3_6} )
 PYTHON_REQ_USE="threads"
 
-inherit gnome.org gnome2-utils meson xdg python-single-r1
+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="cdr gtk-doc +introspection lirc nautilus +python test"
+IUSE="cdr gtk-doc +introspection lirc +python test"
 # see bug #359379
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
 "
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.19.4:3[X,introspection?]
+	>=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[X,pango]
+	>=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]
@@ -36,19 +37,17 @@ COMMON_DEPEND="
 	>=media-libs/clutter-gtk-1.8.1:1.0
 	gnome-base/gnome-desktop:3=
 	gnome-base/gsettings-desktop-schemas
-	x11-libs/libX11
 	>=x11-libs/cairo-1.14
 	x11-libs/gdk-pixbuf:2
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 
 	cdr? ( >=dev-libs/libxml2-2.6:2 )
 	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	media-plugins/grilo-plugins:0.3
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-taglib:1.0
@@ -57,10 +56,10 @@ RDEPEND="${COMMON_DEPEND}
 		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}] )
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-lang/perl
-	app-text/docbook-xml-dtd:4.5
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	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
@@ -68,7 +67,6 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 # perl for pod2man
-# docbook-xml-dtd is needed for user doc
 # Prevent dev-python/pylint dep, bug #482538
 
 PATCHES=(
@@ -80,21 +78,14 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	xdg_src_prepare
-}
-
 src_configure() {
-	# Disabled: sample-python, zeitgeist-dp
-	# brasero-disc-recorder and gromit require gtk+[X], but totem itself does
-	# for now still too, so no point in optionality based on that yet.
+	# Disabled: samplepython
 	local plugins="apple-trailers,autoload-subtitles"
-	plugins+=",im-status,media-player-keys"
-	plugins+=",properties,recent,screensaver,screenshot"
-	plugins+=",skipto,variable-rate,vimeo,rotation"
+	plugins+=",im-status,media-player-keys,properties"
+	plugins+=",recent,rotation,save-file,screensaver,screenshot"
+	plugins+=",skipto,variable-rate,vimeo"
 	use cdr && plugins+=",brasero-disc-recorder"
 	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
 	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
 
 	local emesonargs=(
@@ -103,6 +94,7 @@ src_configure() {
 		-Dwith-plugins=${plugins}
 		$(meson_use gtk-doc enable-gtk-doc)
 		-Denable-introspection=$(usex introspection yes no)
+		-Dgst-inspect=false
 	)
 	meson_src_configure
 }
@@ -110,18 +102,20 @@ src_configure() {
 src_install() {
 	meson_src_install
 	if use python ; then
-		python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/
+		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
 	fi
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
 	xdg_pkg_postrm
-	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
+
+src_test() {
+	virtx meson_src_test
+}