gentoo resync : 20.03.2022

3 files changed, 3 insertions, 103 deletions

diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 1c6d1c402fc0..2cfc3d527c7c 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,8 +1,6 @@
 AUX cheese-3.38.0-Fix-infinite-loop-if-thumbnailer-is-not-available.patch 4008 BLAKE2B 6a8fe1f1514b5e033319a21c2cf3e6d57affc78cf0e46a2d5d34e062a6991fd3a12893f8d0ad9f1c55d56e3e7103cc81f00f97d8e633a4649b3ba0e3d03fb2a8 SHA512 57fc9fada8da49de8e8e23f5211a9a90621b9452104322fe8cc7fbf26f7efcd65a78e324a6b5fc560920d09c865b65268df2ec71e74395cd4a10365b8be5f239
 AUX cheese-3.38.0-buildfix.patch 736 BLAKE2B 3118378b5b125ae6fe223d3b114e07805eb2b5d300bb78ec6b8ff3888f19a0b68af0091aa33918c885991a86293c5cc530d65a75d433cd7c5d343889e5740fbe SHA512 6633f5ebdb2662d199d3f44f49754c8e2c9cd2d864084bff079f4f4de9f20d15489f84ca3acba46df0c9af36920c57b1eca94748c097cb744f71669a69fada47
 AUX cheese-3.38.0-vala-genericarray.patch 6731 BLAKE2B 83f283e629106eba1174197f4b0afc9929fcaaaaa6d29ecaa59cbee97a373589638c2aa0da122db0bd11142ef2790e08b8e3a97e757837f4ce420c0f588609a7 SHA512 de93e2664331a792205c29cf893317719b182bece4185452e705cc349d48dbe46d7320a337e16d923dee4da693c07ba0542b4bc4367162212c7df549313849c2
-DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae
 DIST cheese-41.1.tar.xz 1092912 BLAKE2B 9bbfbc59868f39b344b1102f819ca647d82e9dee327f1d2a2e6b30fcfd2c59dd5f79236355d7148e01a4b07d80d630406708d2a152535b5732cfb52690f9f402 SHA512 2c0922dda97f4ce701add45977b405eff9ddbc24eb286e9e05a9f9bfbd7998e8e77ef2a8f1bbce9f8349ff522ee3cb6d6566fa5df80d782e6d844bff69a30074
-EBUILD cheese-3.38.0-r1.ebuild 2328 BLAKE2B 692671c66e723ef87f83efd05db51d0f3e595170892bf17b8b437458acd0b337610a2a395548b1da96c17c863b5a34c537f4f490b64f1ad43f96eb0f2521dbac SHA512 d54cb3648889ba2a88d889c38704b1e2fc070b1341d411e2e97375a97f621234de74d4585009b20c46989216ae00b70ee6c1e1fcf1bc197b600a42152e4f7339
-EBUILD cheese-41.1.ebuild 2274 BLAKE2B 71ba3eb63b7fcb3b946bfa019934e5f2c1938cb8dc2f5b1b42b79ffd415206c6c70d1b40cadc364c6145f79cb7477ffc223a8a21728e382d5ad024605bc1dcc5 SHA512 793812e8f393525b57e2196036c9992100bb98fc4a67286d7b19e3195590e024819d1cea4259dd392a7dde7500e51bc4c5e610f11f42ddd9a0324b7666e0f0be
+EBUILD cheese-41.1.ebuild 2271 BLAKE2B a9499ac60bf74e78706c3fffa8c5567fec478defdcdaa9c1b88f02c47e916f5fb50d33c42a8b9c392f5912195d4c08bb14302cdba41481364948ef6ca9df87ee SHA512 078dc45cbc80319054c8b65c567ca861e9edbd6d1553562c7302d0e95a1c189e360a71e83f5e2d1595aa1f51bdebba0b6e19f085e6e5a894b200867b60689108
 MISC metadata.xml 429 BLAKE2B 7874cf680a041c34e7c5f29b164552d311d333853050e5486aa0f8bdae3fce50316cd00038ba8cbbd102912cdb0c8c7fd5d6370af0004c8977e053eb89be9687 SHA512 ea2a94d4981bc40d13235bfa9a544855cdeb638e46293c84bfaf14f13dc255651c0eb01752b5987b42e285765ed2dbd65dbd58eb23c730e4cbd7fc31e0003fc8
diff --git a/media-video/cheese/cheese-3.38.0-r1.ebuild b/media-video/cheese/cheese-3.38.0-r1.ebuild
deleted file mode 100644
index f721a44d310e..000000000000
--- a/media-video/cheese/cheese-3.38.0-r1.ebuild
+++ /dev/null
@@ -1,98 +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}-Fix-infinite-loop-if-thumbnailer-is-not-available.patch
-	"${FILESDIR}"/${P}-vala-genericarray.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() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	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-41.1.ebuild b/media-video/cheese/cheese-41.1.ebuild
index 5dc9460395c7..77211bff172b 100644
--- a/media-video/cheese/cheese-41.1.ebuild
+++ b/media-video/cheese/cheese-41.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,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 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"