gentoo resync : 29.12.2022

4 files changed, 2 insertions, 71 deletions

diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index d9462599b574..5b63f15b20b6 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,6 +1,3 @@
-AUX fix-build-with-meson-0.61.patch 575 BLAKE2B 29986accfef997c31c3810781a1f896de0548b742897964ce2149a8dc4d52cb2bed0cad67271d059dfb8c9ae760861fa6dd16f654ea28c488e3c3b9d8bfe8e79 SHA512 8c083dad0840cb0f304022e9bdfe1622a224070d10c9295efb35900f99f13d434c1a26fe90d587426a6285cd5adc745cbcd4054f1f8885fd64d7a20f2291962f
-DIST gnome-characters-41.0.tar.xz 197092 BLAKE2B d903489ed8fc4b722c5635fe5aa57eb00803b5a357405b7fbbe9af844cc3112070ef8fbcf79147578ce99dacafda287e43bfc57a2f5e9cf75dae56e388453109 SHA512 faa76b8ced642d5a1c4641fc4670800f851dd0aae98cd227fd0847c5b930d572f6838e677e11858d62f672a6cabfb1c5aa582a534cd8e37541e9fc1bb16fcc04
 DIST gnome-characters-42.0.tar.xz 561308 BLAKE2B 454d2bbdc5e8486f50b3f21bba4a65aa0920654c2cc3376cdda62070011c1a296f240632ddcd412add7953fccb2780ba37ac3196aef138e9771cdf5a81061441 SHA512 ba6fa07ff90ede1cba0e541f0c4bda63f1d6122c18af44dafa3bfb0fa6f9580a3cd8580d0a12510e2eb95afedb4b0f350accc37eee85c3aa4422a66732dff404
-EBUILD gnome-characters-41.0.ebuild 946 BLAKE2B 9b14d0665331d3018fcec439346d3379f0a792e8000897e2fce554c96617365727397802f6c5182f52908a5b1f8bc26f16234ef64fcaed9f925b8313fe39444b SHA512 92a6dd7d59d18ee1489afc56ad28c839d6fed49e8d3403d82adbd235b44565ae90af01d5f128d1b6b4dc823eb25615bc7a451430dd4ce5e7961e49f7424c1b18
-EBUILD gnome-characters-42.0.ebuild 889 BLAKE2B 65ee1ec9ee99394868ff61373a7ba1ebe88a8325cfcc9ef56ca338ebe189cddc9d526239ed1e3e1c174ab2111304f007a821a7308fe215122cc0e99dd6599666 SHA512 53ef8279032ed5bec03f1ab3b3062397d9b7445e100c324ebdd868282b8fe98e82bbe649b45ee368a65b8524abd9423b7524c96ae9aaec64f0b31ff147fce239
+EBUILD gnome-characters-42.0.ebuild 886 BLAKE2B 8b8dca7593698dc38ede5d17edbed25f9214c77ea9d93782a81ba30240d03cfc43f3dd468945016b2e85ec15375da4f279efa7572571e1664dc55700c3274671 SHA512 683a6a69912d74edac3951c1885f8aac9c46c6cd7c385003553882c66530ec1fb6dd35b5db84f57dd1dc960e786531344591de7087f0fd32c39a5776c95fa80e
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch
deleted file mode 100644
index 4033314ea517..000000000000
--- a/gnome-extra/gnome-characters/files/fix-build-with-meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Part of https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3b84cc750b70482a1cc30864dc51cde60df0332d
-https://bugs.gentoo.org/831471
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -47,7 +47,6 @@
- desktop_conf.set('bindir', characters_bindir)
- 
- i18n.merge_file(
--  'desktop-file',
-   type: 'desktop',
-   input: configure_file (
-     input: characters_name + '.desktop.in',
-@@ -61,7 +60,6 @@
- )
- 
- appdata_file = i18n.merge_file(
--  'appdata-file',
-   input: characters_name + '.appdata.xml.in',
-   output: characters_application_id + '.appdata.xml',
-   po_dir: po_dir,
diff --git a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
deleted file mode 100644
index 38255a48b231..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/gjs-1.50
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5:=
-	>=x11-libs/gtk+-3.20:3[introspection]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.36[introspection]
-	gnome-base/gnome-desktop:3[introspection]
-	>=gui-libs/libhandy-1.1:1=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/fix-build-with-meson-0.61.patch
-)
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
index ec5ee407a8a9..7faa01532845 100644
--- a/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/gjs-1.50