gentoo resync : 28.04.2021

5 files changed, 3 insertions, 279 deletions

diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index a60bd7050950..c530a68133d7 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,8 +1,4 @@
-AUX cheese-3.34.0-buildfix.patch 736 BLAKE2B b99354dd49acb32201ddcdd104b0581e2a61248053017859ea2f0b20b2a66a4f5bfb5d5a26e458464b9a18ae0e8a8e7bfe801d2cc9758331a5a2ba28aad4a78c SHA512 0a6373485cd07398ac5dca0ed1431ee2ed7b174bb55ee45a839775cb229bfbb223897be2590e238487eb3971fde0d9bbc5c85194239e8ff03d84742f0071acff
-AUX cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch 6545 BLAKE2B 6bd549dc4a26dc4cd1f14b812d4910fb93b19e899a58c6c1e4cd713bc126c059d2f1d148f9e5d3581cf64a8c4f3ea938e684e85535d774fd8861bd87cd93df3c SHA512 6f8f66897252172b68508ded5996213e4660ec00b5172874e0b360ee1c60baf2e579f88998dd78c850d4eb6796a097f74646c28f923f7f11de9302f2dd8023b7
 AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
-DIST cheese-3.34.0.tar.xz 1077052 BLAKE2B 9719818aebb3472b804d96d79b02ee71b818d098b6eeb54f2075939e95ba651c251d561b4bc79c30a0aae6217a8a29f46f045be9279c9100ba1b0344f1279ba5 SHA512 093b4e5f7f15fd0c445fffd254d4a5035a4e3e91bacccdeeda64a4a7182901646daea5c8596c954a67896f9aaf37dab2309c21e8f026583f59d787a2c1e4c200
 DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
-EBUILD cheese-3.34.0-r1.ebuild 2152 BLAKE2B 2104d16b5408457dc4e2c9ea3f48cbccb5e753383ebf20e89c662162a4028ac75c798ee3988816cef6467e71f01042a3778d40cf6a803cca75e574396702ee56 SHA512 d579bb91cedcc2e11c143b0fffeb1ed11b597c8644e08d25d19342ae3b1a5842710e672c76a5ec53cbed992ea51f4853de33d04f45fb305eb1d5f4e0dd331c46
-EBUILD cheese-3.38.0.ebuild 2095 BLAKE2B 8caa33b4191ab34ce9a7c7b0e5c9a54ec70c130fce2ace9c59e4b0e9c8b83ee800d111bb816b97eeae8d004d003846bcedf4e3ae23f7e09b4e2437e34e96cc10 SHA512 81a56fcfd18e2a39afb94dae8a6dffec3b88386d6dc1b54a712843be744012373a672a190cf60e11c137ffa9405a34b89a74d15474515aa666d71696226b14e6
+EBUILD cheese-3.38.0.ebuild 2120 BLAKE2B c28699d5912d6bcf91c9c95b02f00bb1e2c5c88964b67dd46681549eccc0570fe1cd55a3d21bacf5b557ba0bb4c4cd9ac1e4ecea4d13cd067577bca19abda7fa SHA512 5af98575aafab5be072e221cc54d4f317cca56fd1bb60a17c80b5811760d2f63c4140ffeecaa350677491737c2bc4bd66ffc2ca7d7d6be835b978246aad62b4b
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.34.0-r1.ebuild b/media-video/cheese/cheese-3.34.0-r1.ebuild
deleted file mode 100644
index fd904b0cdccd..000000000000
--- a/media-video/cheese/cheese-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson vala virtualx xdg
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-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"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	media-libs/clutter-gst:3.0
-	>=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[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:= )
-
-	media-libs/cogl:1.0=[introspection?]
-
-"
-RDEPEND="${DEPEND}
-	>=media-libs/gst-plugins-good-1.4:1.0
-
-	>=media-plugins/gst-plugins-jpeg-1.4:1.0
-	>=media-plugins/gst-plugins-v4l2-1.4:1.0
-	>=media-plugins/gst-plugins-vpx-1.4:1.0
-"
-
-BDEPEND="
-	gtk-doc? ( dev-util/gtk-doc )
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.3
-	dev-util/itstool
-	dev-libs/appstream-glib
-	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=(
-	"${FILESDIR}"/${P}-buildfix.patch
-	"${FILESDIR}"/${P}-help-No-more-menu-bars-in-3.34-UI.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use test tests)
-		-Dman=true
-	)
-
-	meson_src_configure
-
-	# Hack: version.xml is not generated if gtk-doc is not enabled
-	echo ${PV} > docs/reference/version.xml
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-video/cheese/cheese-3.38.0.ebuild b/media-video/cheese/cheese-3.38.0.ebuild
index c12f4984c2fb..1044f8b7f629 100644
--- a/media-video/cheese/cheese-3.38.0.ebuild
+++ b/media-video/cheese/cheese-3.38.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+VALA_MAX_API_VERSION="0.50"
 
 inherit gnome.org gnome2-utils meson vala virtualx xdg
 
@@ -10,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/cheese/files/cheese-3.34.0-buildfix.patch b/media-video/cheese/files/cheese-3.34.0-buildfix.patch
deleted file mode 100644
index 8e2ac282481c..000000000000
--- a/media-video/cheese/files/cheese-3.34.0-buildfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/meson.build b/meson.build
-index a4775d44..9d1e5587 100644
---- a/meson.build
-+++ b/meson.build
-@@ -149,11 +149,7 @@ gnome_video_effects_dep = dependency(
- # Recommend some runtime GStreamer plugins.
- gst_inspect = find_program('gst-inspect-1.0', required: false)
- if gst_inspect.found()
--  foreach plugin: ['camerabin', 'vp8enc', 'webmmux']
--    if run_command(gst_inspect, plugin).returncode() != 0
--      warning(plugin + ' was not found. It needs to be installed before Cheese is run')
--    endif
--  endforeach
-+  warning('unable to check for runtime GStreamer plugin dependencies due to Gentoo\'s sandbox: camerabin, vp8enc, webmmux')
- else
-   warning('unable to check for runtime GStreamer plugin dependencies')
- endif
diff --git a/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch b/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch
deleted file mode 100644
index b19c8fa30d5e..000000000000
--- a/media-video/cheese/files/cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 9a9e47a3d3e910805bd7c9c1763c66400181f677 Mon Sep 17 00:00:00 2001
-From: Andre Klapper <a9016009@gmx.de>
-Date: Sun, 5 Jan 2020 23:35:37 +0100
-Subject: [PATCH] help: No more menu bars in 3.34 UI
-
----
- help/C/burst-mode.page            | 5 +++--
- help/C/pref-countdown.page        | 6 ++++--
- help/C/pref-flash.page            | 5 +++--
- help/C/pref-fullscreen.page       | 6 ++++--
- help/C/pref-image-properties.page | 5 +++--
- help/C/pref-resolution.page       | 6 ++++--
- 6 files changed, 21 insertions(+), 12 deletions(-)
-
-diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page
-index a14d3ab8..0a587ca1 100644
---- a/help/C/burst-mode.page
-+++ b/help/C/burst-mode.page
-@@ -9,6 +9,7 @@
-     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
-     <revision pkgversion="3.8" date="2013-04-19" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -59,8 +60,8 @@
- 
-   <steps>
-     <item>
--      <p>Select
--      <guiseq><gui style="menu">Cheese</gui><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>.</p>
-+      <p>Press the menu button in the top-right corner of the window and select
-+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>.</p>
-     </item>
-     <item>
-       <p>Edit the preference settings:</p>
-diff --git a/help/C/pref-countdown.page b/help/C/pref-countdown.page
-index 9077d7a0..8f4b0292 100644
---- a/help/C/pref-countdown.page
-+++ b/help/C/pref-countdown.page
-@@ -9,6 +9,7 @@
-     <revision pkgversion="3.1" date="2011-09-19" status="review"/>
-     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="final"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="final"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -28,8 +29,9 @@
-   <title>Disable the <gui>Countdown</gui></title>
- 
-   <p>By default, <app>Cheese</app> counts down from three before taking a
--  photo. You can disable this feature by selecting
--  <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Capture</gui></guiseq>
-+  photo. You can disable this feature by pressing the menu button in the
-+  top-right corner of the window, selecting
-+  <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>,
-   and unchecking <gui>Countdown</gui>.</p>
- 
- </page>
-diff --git a/help/C/pref-flash.page b/help/C/pref-flash.page
-index b6ccd736..52897d2f 100644
---- a/help/C/pref-flash.page
-+++ b/help/C/pref-flash.page
-@@ -9,6 +9,7 @@
-     <revision pkgversion="3.1" date="2011-09-19" status="review"/>
-     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="final"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="final"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -30,8 +31,8 @@
-   <p>When you take a photo with Cheese, the computer screen briefly turns
-   white.</p>
- 
--  <p>To disable this feature, select
--  <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Capture</gui></guiseq>
-+  <p>To disable this feature, press the menu button in the top-right corner of the window, select
-+  <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Capture</gui></guiseq>,
-   and uncheck <gui>Fire flash</gui>.</p>
- 
- </page>
-diff --git a/help/C/pref-fullscreen.page b/help/C/pref-fullscreen.page
-index a90baaad..7e79f374 100644
---- a/help/C/pref-fullscreen.page
-+++ b/help/C/pref-fullscreen.page
-@@ -7,6 +7,7 @@
-     <link type="guide" xref="index#preferences"/>
-     <revision pkgversion="3.6" date="2012-05-09" status="stub"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
- 
-     <credit type="author">
-       <name>Ekaterina Gerasimova</name>
-@@ -23,10 +24,11 @@
-   <p>To enable or disable the fullscreen mode:</p>
- 
-   <steps>
--    <item><p>Select <guiseq><gui>Cheese</gui><gui>Fullscreen</gui></guiseq></p></item>
-+    <item><p>Press the menu button in the top-right corner of the window and select
-+      <gui style="menuitem">Fullscreen</gui>.</p></item>
-   </steps>
- 
--  <p>If you cannot see the <gui style="menu">Cheese</gui> menu in fullscreen
-+  <p>If you cannot see the menu button in fullscreen
-   mode, move your mouse or tap your touchscreen.</p>
- 
-   <note style="tip">
-diff --git a/help/C/pref-image-properties.page b/help/C/pref-image-properties.page
-index eea2c0e3..7d812596 100644
---- a/help/C/pref-image-properties.page
-+++ b/help/C/pref-image-properties.page
-@@ -10,6 +10,7 @@
-     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
-     <revision pkgversion="3.8" date="2013-04-15" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="review"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="review"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -33,8 +34,8 @@
- 
-   <steps>
-     <item>
--      <p>Select
--      <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Image</gui></guiseq>.</p>
-+      <p>Press the menu button in the top-right corner of the window and select
-+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Image</gui></guiseq>.</p>
-     </item>
-     <item>
-       <p>Move the sliders to find the best settings for your webcam.</p>
-diff --git a/help/C/pref-resolution.page b/help/C/pref-resolution.page
-index a620a4ba..42846841 100644
---- a/help/C/pref-resolution.page
-+++ b/help/C/pref-resolution.page
-@@ -8,6 +8,7 @@
-     <revision pkgversion="3.0" date="2011-08-25" status="candidate"/>
-     <revision pkgversion="3.1" date="2011-09-05" status="review"/>
-     <revision pkgversion="3.12" date="2014-02-21" status="candidate"/>
-+    <revision pkgversion="3.34" date="2020-01-05" status="candidate"/>
- 
-     <credit type="author copyright">
-       <name>Julita Inca</name>
-@@ -38,8 +39,9 @@
- 
-   <steps>
-     <item>
--      <p>Select
--      <guiseq><gui>Cheese</gui><gui>Preferences</gui><gui>Webcam</gui></guiseq>.</p>
-+      <p>Press the menu button in the top-right corner of the window and select
-+      <guiseq><gui style="menuitem">Preferences</gui><gui style="tab">Webcam</gui></guiseq>.</p>
-+
-     </item>
-     <item>
-       <p>Choose a different resolution from the drop-down list. Some webcams
--- 
-2.24.1
-