gentoo resync : 20.03.2022

3 files changed, 2 insertions, 33 deletions

diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index c62915cf517d..d6736626126d 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,6 +1,4 @@
 AUX gnome-font-viewer-41.0-fix-meson-0.61-build.patch 1127 BLAKE2B 7cb4c294ea2a2e8b117a699008075435a8d60ad970db8afe9bbd86c6b5d7fd6b423b6c4535b6ee4c4475384a7749c2efdd0530f229f9d3b61f78a08f23a82cd6 SHA512 2f339dfb9f4a566a334273730cabf983deafc062221b6170d8858780bcee20e7cdffcf95fb159afeb0def7966c105267c9469f7c06542d4d2af208c5b895a68d
-DIST gnome-font-viewer-40.0.tar.xz 175396 BLAKE2B 33e10646fe31f76696867c0c5e7a99385064f09049390adb78149141f906958a6f14c3e29a9fbbfe8c48879f4600963ec66e9753018d9d7d658f4111c6dad120 SHA512 c82044e6750494d693cf631abe7fb76c655b58965ccd1ca08f512f0e79c40e9f207997465908b99e5813f350ca05ea8e76f029be79f3008173c49f3c5a4ee23d
 DIST gnome-font-viewer-41.0.tar.xz 179672 BLAKE2B ce9e91b319ccf2e099cd30cf13e407270775950321e2bea69703050b5797ed879320939d260aba175f3ed6f5719e23f5628c6501f362c3e367ca5ddf70902037 SHA512 09d9ddcdd18fd0023dff46e7197988473119e0d753b7814fdca0116c6831a93146301dd56ee77546121c573c8d93801b5d8fed0c46da47052e31749058c21d50
-EBUILD gnome-font-viewer-40.0-r1.ebuild 706 BLAKE2B c1bbe6bdf32929b50ee427b4d6ede320fad7c70d5cf79340a843491edb5ddbde4aa75f78dcd2020b6b6aeb22850d4ec49a03a1ddc9d649158b617218f17b8ee7 SHA512 b002c91fba2b1e43908b78fe8e97fdaf833595328e28299df2d701d3bac271de115b3ae028238d496ddf447a3277e5c19b07853dc4efe9931746bb18b54fb733
-EBUILD gnome-font-viewer-41.0.ebuild 768 BLAKE2B 76a3993ef8d211ef65b1704f8bacd52826aa09b3304e312f48d80f9e0d16e7b12ef3f9b6c751fccebb6e857b9b7a83e7ea5c1b838642c2de44f7dec42cdf76be SHA512 68113b0a971dd79a2d35a24270b637b5ac464550c16aa843c8477a1bbd9579676ca5c032ae9bdb763819b81806fe805c53832ebc464cb8682a1696451f66db9f
+EBUILD gnome-font-viewer-41.0.ebuild 765 BLAKE2B fd4fe11ea6248a29345ba3e233fcf3cf6c1af03931c20c19b03f85b88fba22dbae2329b54b55d2e438266d00d2a692ea1efa50b5037d8a4716c7efec9950a2e8 SHA512 c46a4053b7542e9a661cb437575ba7499dd5a9c4cf9b036f5ad37b7a93a69e389df482be1b6946d91686fbaa2fa6dc52c18b077f30e8cc2fba069fa98b069075
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
deleted file mode 100644
index 55c0af0cc18e..000000000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.1:3
-	>=gui-libs/libhandy-1.0.0:1=
-	>=media-libs/harfbuzz-0.9.9:=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	gnome-base/gnome-desktop:3=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
index 8198ca052745..6b95fb99e771 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2