gentoo Easter resync : 12.04.2020

2 files changed, 29 insertions, 36 deletions

diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index bcb83d4db87d..b3ebc2bcb86e 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -3,5 +3,5 @@ AUX cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch 6545 BLAKE2B 6bd549dc4
 DIST cheese-3.32.1.tar.xz 1487792 BLAKE2B 6e27b68f590aa4f90a8bbbc72972bed96fe9741b4efd849d226751cfd6abe37241fa214240c4a8b0449fb2bc53de1043ac0abd60a06bc884796a4272c07212af SHA512 bdd0ae72e3df596d19ad467dc0222a49b028f2ad8c285d55360813624ca2dac1956463cfd9cea4f2a6ff123070966544cd7254ee2891e973dca42d07061a6c94
 DIST cheese-3.34.0.tar.xz 1077052 BLAKE2B 9719818aebb3472b804d96d79b02ee71b818d098b6eeb54f2075939e95ba651c251d561b4bc79c30a0aae6217a8a29f46f045be9279c9100ba1b0344f1279ba5 SHA512 093b4e5f7f15fd0c445fffd254d4a5035a4e3e91bacccdeeda64a4a7182901646daea5c8596c954a67896f9aaf37dab2309c21e8f026583f59d787a2c1e4c200
 EBUILD cheese-3.32.1.ebuild 1945 BLAKE2B 389b37c1dbb908d1b41b2ad91c4064059861e949d5c860d7ef226d51bcb4d20cab4fbc8221834b89b880d61ece209519cb06615cc5f7166cac71e5cc91ff8260 SHA512 9e0a2b41c23aba4915e83d44fa6e2dab3f7a89ff87060ae9a53e4cf37ccba0ec2c516cc47479001041fbaa693adf0ddbef862c6957d6d050d1a98dc014de1d52
-EBUILD cheese-3.34.0.ebuild 2183 BLAKE2B 217a81216e444b087078ef9b21d4fb20b0fa4b5dd2477ffea258060da362ce08ed5cf3ece1622abbe2f1758ae25ffb1b7737c4d44c274f44b69bfe2e4d5214cf SHA512 de14d1da97b065f0ad42e99fd292668369fe8f2340dc4407be03c146540926020e44416c8524bf1ef9e68303c7ca6467afe3607d79e61720d3acc559d95c28be
+EBUILD cheese-3.34.0-r1.ebuild 2142 BLAKE2B b1e00e30911c202455778903a473ca48caf070b5e6857710d06dce5eeb4c43888f0aa18b746080a3c52d850400e80ebc73ccf117931939211e73f64ffda9f645 SHA512 4c333e6a0e0fdcc10fc8c0e2a64e753ee75a71e5702ace5ae50d0b2b9dce8b8322bf0e31769f8c925d861a84b21cb444ca4e1793fd02f52bc7ab1e6e81ebf46c
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.34.0.ebuild b/media-video/cheese/cheese-3.34.0-r1.ebuild
index 5260911df0d1..17d4540d9887 100644
--- a/media-video/cheese/cheese-3.34.0.ebuild
+++ b/media-video/cheese/cheese-3.34.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org meson vala virtualx xdg-utils
+inherit gnome.org meson vala virtualx xdg
 
 DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
 HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
@@ -11,41 +11,30 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk-doc +introspection test X"
-RESTRICT="test" # Tests fail
+IUSE="gtk-doc +introspection test"
+RESTRICT="!test? ( test )"
 
-REQUIRED_USE="test? ( X )"
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.90:2
-	>=x11-libs/gtk+-3.13.4:3[introspection?]
-	>=gnome-base/gnome-desktop-2.91.6:3=
-	>=media-libs/libcanberra-0.26[gtk3]
+DEPEND="
 	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
 	media-libs/clutter-gst:3.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
+	>=media-libs/clutter-gtk-0.91.8:1.0
 	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-
+	>=dev-libs/glib-2.39.90:2
+	>=gnome-base/gnome-desktop-2.91.6:3=
 	>=media-libs/gstreamer-1.4:1.0[introspection?]
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X?]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	>=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=x11-libs/gtk+-3.13.4:3
+	>=media-libs/libcanberra-0.26[gtk3]
+	x11-libs/libX11
+	sys-apps/dbus
+	media-video/gnome-video-effects
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)
-"
+	media-libs/cogl:1.0=[introspection?]
 
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( x11-libs/libXtst )
 "
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-bad-1.4:1.0
+RDEPEND="${DEPEND}
 	>=media-libs/gst-plugins-good-1.4:1.0
 
 	>=media-plugins/gst-plugins-jpeg-1.4:1.0
@@ -54,15 +43,18 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 BDEPEND="
-	$(vala_depend)
+	gtk-doc? ( dev-util/gtk-doc )
+	dev-libs/libxslt
 	app-text/docbook-xml-dtd:4.3
 	dev-util/itstool
 	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	dev-libs/libxslt
 	dev-libs/libxml2:2
 	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( x11-libs/libXtst )
+	$(vala_depend)
 "
 
 PATCHES=(
@@ -71,9 +63,8 @@ PATCHES=(
 )
 
 src_prepare() {
+	xdg_src_prepare
 	vala_src_prepare
-
-	default
 }
 
 src_configure() {
@@ -95,9 +86,11 @@ src_test() {
 }
 
 pkg_postinst() {
-	xdg_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	xdg_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_update
 }