10 files changed, 412 insertions, 0 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5481ae9be9a2..356ed2b93aef 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 765c6a1f96d3..7c9750b91769 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,6 +2,8 @@ AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aa
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.44.4.tar.xz 4784388 BLAKE2B dd5b7094af9c66b710d61de282ff7e223fd87524f0135b7fc2c962d7829a8ed25a90a5fa73d155b692e28d9d18807f8c8731efbfb32613e2e1a020008739beae SHA512 385137f1e412b5c5bcd496d493da4657f8bb6e72519f6e62ab1a683c729082ea0ddcf7b5dae8c0cdf37cb279a1cf59ffb6dd61009c693001d03a0d54264e979a
 DIST evolution-data-server-3.46.0.tar.xz 4817048 BLAKE2B 5c07137659132fca4e2e42d616d3b7e26317f44009de1c9582105a65036884c5b1f7521ac325e2a74a6493362a38b6761d78dabd00b9e64b51a352bcd1d225af SHA512 3aef4ef51e5be2c5e392a2b2781283bb75d8e7d08a3a0daae6be488d14e998779b992095d12889d2d6afe5c732394090f99fa9a866e8825eecdcde2bf6b24ec1
+DIST evolution-data-server-3.46.1.tar.xz 4843728 BLAKE2B 1053389277c9b8f83c80db382ba14db974a0674e75f728ac24a21e49f2c744c0239d19f380487487a2798db85706c5c0a7cb867508726e40034bcdcbb46da6c1 SHA512 6dbb9b192c46fdec25eb3587f90c5c2f3de902c80996d691978be519d7f7aad9946d3282c44febcf498bb8d497b639f3afeeead3f032bbb0cd1ddb380a0ca5e7
 EBUILD evolution-data-server-3.44.4-r2.ebuild 4510 BLAKE2B 6c70a5ced1a2c2a815898b45728162a852771f9e2dfa2b77decb8844ae7a48b3a05ac1770862136bf0b5e104365254c080ff1c66bce10dcbb6d6b30860b5f81f SHA512 2cc50e79bbaf8ba95b8cdac5a20b20aa13a89db78cb99c7fd5cd67cfd2753cdc1e6fd275a253acd1b337ab77d5295b8755e5d1edcd2830ce10498ee551831c7c
 EBUILD evolution-data-server-3.46.0-r1.ebuild 4064 BLAKE2B 19c0bc2cd9167ce2907adaa9d6e6dca2daf81f17045eb0c4e0a9b4d7f545301280088453bc83bdeaa958030f38ea79bc76074d37260f408437c753210e88a27c SHA512 0ed0a208c7750f5600f623e0fe1219430315972d4a68e1956bf610170d597cce482807ad9e41a693fee10737a0c6064357ed5bbdf496bd7e1d1aed5a765782a0
+EBUILD evolution-data-server-3.46.1.ebuild 4064 BLAKE2B 19c0bc2cd9167ce2907adaa9d6e6dca2daf81f17045eb0c4e0a9b4d7f545301280088453bc83bdeaa958030f38ea79bc76074d37260f408437c753210e88a27c SHA512 0ed0a208c7750f5600f623e0fe1219430315972d4a68e1956bf610170d597cce482807ad9e41a693fee10737a0c6064357ed5bbdf496bd7e1d1aed5a765782a0
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.46.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.46.1.ebuild
new file mode 100644
index 000000000000..54af15fb111a
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.46.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake db-use flag-o-matic gnome2 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather"
+REQUIRED_USE="
+	oauth? ( gtk )
+	vala? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# glib-2.70 for build-time optional GPowerProfileMonitor
+RDEPEND="
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17
+	>=dev-libs/glib-2.70:2
+	>=dev-libs/libical-3.0.8:=[glib,introspection?]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4
+	>=dev-libs/nss-3.9
+	>=net-libs/libsoup-3.1.1:3.0
+	>=dev-libs/json-glib-1.0.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=x11-libs/gtk+-3.20:3
+		>=gui-libs/gtk-4.4:4
+		>=media-libs/libcanberra-0.25[gtk3]
+
+		oauth? (
+			>=net-libs/webkit-gtk-2.34.0:4.1
+			>=net-libs/webkit-gtk-2.36.0:5
+		)
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-4.2.0:4= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend)
+		>=net-libs/libsoup-3.1.1:3.0[vala]
+		dev-libs/libical[vala]
+	)
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_setup
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+	  -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+	  -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_GTK4=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2_WEBKITGTK=$(usex oauth)
+		-DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=ON
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 6653ee8352a3..be6fc890e7b0 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,7 @@
 DIST evolution-ews-3.44.4.tar.xz 691396 BLAKE2B 69344bec9dffe21e54e77325929b791cc89072e9a2a2f9a0fbcf5551c1f8b13c90c4a3c2bd934956c4e1b73b306fbdd6827c6fb4ef7aee182a3bdbeb450d124a SHA512 0326b274fbcc3630ccaf6517495ce22409706f0ad16c11b189f91c27ab8921a639bb07296d51063e71cb706e66bd861044adbf146b16f9fca4b4cd9cde6edb65
 DIST evolution-ews-3.46.0.tar.xz 691740 BLAKE2B 1d956a39dc0233c8a8c3a23f2be3be2e2d697eca71d4e7317db69ca4ade007a4e2ac51edb99851aa75c009ed40e5c0b149b1ddab7cd6826eb4dddcb08f62f326 SHA512 3c01e981857e02c45660bd0d8143ce0f19dd20b30916b8334c15546e6ff720efb4fd52ab0cfb312a5767958cf0eceb5e39213256b75feb15e5c1fea6755b2dd9
+DIST evolution-ews-3.46.1.tar.xz 692020 BLAKE2B 9ccabf0393842a829f5a319fcca886e1546cf1bad3e5199683822ef68c9c285430076a11e87f646f052e9e4c8ba691029d31bce4b4da833c6e291252ab0f57fd SHA512 0e258aa2af4305f46926c43dba1787cf5e577567aa385e7d039b2e18d9660e24f7571b9b4e8660a8203e6dabd3f1346670164620f73c9465cbb6516a7076ab25
 EBUILD evolution-ews-3.44.4-r1.ebuild 1560 BLAKE2B f17aeee022f634c5f649d199a737508e40476732b3640664e7cc32a09d456d5b6be9f332cccb182df37110edce2f60277f06830d106b5f0eab9c773113b92967 SHA512 a0ef1eb981174aa1a43e68464bd8d074b683331387c12b0c96c4f8a847df08480ee8b94b5b317cda5e4883d74c098b936bb6dda82ad9c2d2cea06536ba1fc0c5
 EBUILD evolution-ews-3.46.0.ebuild 1569 BLAKE2B ad6d58dc251bc434f6cd5d3a8c097ab641715dcae6f63b68a33c0b2c4029d0c525aeb7128cd7d3ab3c6b0052050d3b401fc565953a755d811ce3461040d2affc SHA512 76893a81fd26c7a07ad72fc148646ad35a36a34436b448e6f13f71fc5dc35173b0696dc72df367cf21feb1d13d3cbbc2f976e32503e7519c51c369fb14df49eb
+EBUILD evolution-ews-3.46.1.ebuild 1569 BLAKE2B ad6d58dc251bc434f6cd5d3a8c097ab641715dcae6f63b68a33c0b2c4029d0c525aeb7128cd7d3ab3c6b0052050d3b401fc565953a755d811ce3461040d2affc SHA512 76893a81fd26c7a07ad72fc148646ad35a36a34436b448e6f13f71fc5dc35173b0696dc72df367cf21feb1d13d3cbbc2f976e32503e7519c51c369fb14df49eb
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild
new file mode 100644
index 000000000000..d8248e7b6518
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.46.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gnome2 optfeature
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/json-glib-1.0.4
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-3.0:3.0
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	test? ( >=net-libs/uhttpmock-0.9:1.0 )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+}
+
+pkg_postinst() {
+	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
+}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 7b9c9868aff6..0e7bfb8c68ab 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -2,6 +2,8 @@ AUX 43.0-fwupd-Update-the-self-test.patch 1467 BLAKE2B 368b70c15ce19b67bf9625b9a
 AUX 43.0-metainfo-Correct-release-information-to-pass-appstre.patch 14940 BLAKE2B 2692a3a648c6b20f3531a7e846e12ac09a9d59c86246cc4544624cb78cf7c48f568fbfaecc476e03ffc581e55389553e51ee01aef0920215f030dad5e080e4cb SHA512 5043f8b10c4f49f31ae065e326f861a83c1ae3862c21b8e7de312f04becdd75e282530df539f7320a689eb95266eb2b03c595dfeabd6b561c8e1648b1c679384
 DIST gnome-software-42.4.tar.xz 2278412 BLAKE2B beb63ba7f874b72edd3c592f0a7553a4a5ba3631ede55da4c70989604cd0433dd40dd7c75b4bafdf106f1c02285e8502a610d8e2c9edf8cc4d34ea14f75fab62 SHA512 00c70886c6e3302a59ae533034d8d75cfe05873ea40d0d05a03e15ae34101bb8a64722a7c6a6d43bb54b61033bc14af1542bb832a70ee7b1a2dab6dacb8ffd8f
 DIST gnome-software-43.0.tar.xz 2352976 BLAKE2B 8dc8b03c198aad01e73026ccb4b3e99888f39e9bbd99d9809863a2fe405865022a33458194f3769a3a5e9ff7a888beb463aca2805d90405342f9aae4485b352a SHA512 bcf64e4d3d847c660fd1c1a2356235569560bc315fb6b0d2e459dfb1bbee7bf97d9a14f7c8ef1129e01241385cd1540d1499f9cc9ad99a996965feb48e698d6a
+DIST gnome-software-43.1.tar.xz 2351032 BLAKE2B e8718817ee9a6ac458f57d5f06271136d590ba2e6a951a05f143f5f85e124b0a64e1866fd50a1ff8e28e24682ffcb6ffb72dfd2ee8fcb9f6e8dd2fa3797513a5 SHA512 5494622e1c52bcf660df8ab83cd73720ccab3c767f8870b6a23bd83c396972c508beb365e6df143055e3a7d9e77b42f01ea73a49d8dcdcf97aaeada0fe9f03e5
 EBUILD gnome-software-42.4.ebuild 2800 BLAKE2B bf6d0e0f52184efe135c677289dcbaceb2a7adb7b326e0a6597dfe2e8c8aee38772a93a74cc421857a663686caac6ded75f374c07f0f900c186626cb3e641c9e SHA512 809ef0e439d4f0f908228fa4d5f71c479bd1114b2af4cee3e5f8ab67a2e3c0018441494ff56b57cd6f691acac5f4c859ee299ab70d2e5173df06a00171e363de
 EBUILD gnome-software-43.0.ebuild 2783 BLAKE2B 23bfdc781acedca00698cc41ca76c0c32004427b6fa3ec00009c5e2d653b65887329bbcf3077196f20c5660ea3844c19b6e5bdf34c82c491830e24619e8d7339 SHA512 c85670858d264d1cb33df75b4fad441c909b9b99eade5bf4ff86bfc2ca19d6e5c3374b29aeba8f99803eeb49c7ab07f15c05077906fbea3ab0fd64f408b33aa4
+EBUILD gnome-software-43.1.ebuild 2636 BLAKE2B 5407bc77db2ed2dd43fdb628faa5851b40114c56c41d1dfe920a4940b59fe81c5c732f6e1e67dbe7230f989fb12950934641e26d5e521b4ebab1300865ceb88d SHA512 ced57c7bcdccbe6294f3b7fea45de1fe73b632af5fa7d41e0f192a56a2dc3bdcaffed86bab58c40331d8fd44bbe0da8a6aa8ef01f5cd34f47ba14f5bc49f5c10
 MISC metadata.xml 579 BLAKE2B 4ac8aea21122da6a03605961d9f47721a06a4c49ffdc1ffa16eee5a473f5e5957c69760ee7d19e087688fe2b479a16f4cf417cbe0e2d3e149b0339881fecd2fc SHA512 3f783e0f7fbec5a95f498d622885de19babf8f786a66af2d3755907d242df0433a910b07c2628854ed1038920417d7d28c35c10f18adfcbd37e8922aa3c9253d
diff --git a/gnome-extra/gnome-software/gnome-software-43.1.ebuild b/gnome-extra/gnome-software/gnome-software-43.1.ebuild
new file mode 100644
index 000000000000..19f8b6526551
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-43.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software https://gitlab.gnome.org/GNOME/gnome-software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flatpak +firmware gnome gtk-doc sysprof udev test"
+
+RDEPEND="
+	>=dev-libs/appstream-0.14.0:0=
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/libxmlb-0.1.7:=
+	>=gui-libs/gtk-4.6:4
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/json-glib-1.6.0
+	>=net-libs/libsoup-3.0:3.0
+	>=gui-libs/libadwaita-1.0.1:1
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
+	sys-auth/polkit
+	firmware? ( >=sys-apps/fwupd-1.5.6 )
+	flatpak? (
+		>=sys-apps/flatpak-1.9.1
+		dev-util/ostree
+	)
+	udev? ( dev-libs/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/libglib-testing )
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
+	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
+	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
+		-Dman=true
+		-Dpackagekit=false
+		# -Dpackagekit_autoremove
+		-Dpolkit=true
+		-Deos_updater=false # Endless OS updater
+		$(meson_use firmware fwupd)
+		$(meson_use flatpak)
+		-Dmalcontent=false
+		-Drpm_ostree=false
+		-Dwebapps=true
+		-Dhardcoded_foss_webapps=true
+		-Dhardcoded_proprietary_webapps=true
+		$(meson_use udev gudev)
+		-Dapt=false
+		-Dsnap=false
+		-Dexternal_appstream=false
+		$(meson_use gtk-doc gtk_doc)
+		-Dhardcoded_curated=true
+		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
+		-Dmogwai=false #TODO?
+		$(meson_feature sysprof)
+		-Dprofile=''
+		-Dsoup2=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 23bf0222e153..9c9f840be909 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,10 +1,13 @@
 AUX 14.0.1-fix-file-conflicts.patch 699 BLAKE2B a276814cd000ebc34b38b4031e47813935ac0a166acbdfe719e27eb3d83e50ce5eb55486dfe6dfd4bbd53bf56c28d3d213cc266148063fbe8aee06967a423622 SHA512 160d3bcf8ea27fecd51470a15e83ef29c99f9b4c86cce1286d8ba2a6432a11a0fa4ec602db80c8daba3ad5e5e24c602a876fc8ad90e07a65d968ed47e46badfc
 AUX 14.0.1-install-user-help.patch 749 BLAKE2B 954bae11770bccdbf5babea1c06cc829ef069777a52542ffb683ca0709300edbfaa452aea7da44497b900dc653c00b129bcdca0ee6808e6d5f610d43437858d6 SHA512 c1fedabf8eff11256cd4a93130db028c3e599f6f0fd249ff8a4533c1ebf7d3f8c17422b3765dbc047f25bd9c4725c43212de585642a246338c7fcd1c78c3d914
+AUX 15.0.1-fix-file-conflicts.patch 291 BLAKE2B 4ad2a65c731372de5553386bbe3136d0d2ff8dd76d27370f62d707eda83908169bb610d1e9d9687ac2a7e2f51681c07b2b446e92dbb4371b47c39a523f14be40 SHA512 9e9887b295f8b4b817904d2bdbd4dd0944c59daf4dfe1fbd1746e8db70088e40e8410965c10e8a24184407710ad19ae5fc93185e73ed7759a89aecb4ccf73a58
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-14.0.3.tar.gz 1931686 BLAKE2B e72b46450ad97a49519014882cbfd5792a07daf782fdf0d80e4b9221537548a57d3b43dc2b421f3f72d3b0adfee6f11c53304b4468c78b766ffee9536efebba2 SHA512 cb43265a2b54231c15331c299ed10bba8bb83bdc1860ee50764bed8a40ce1421f49edfeb7fa5814c8aac6c23f80936a966346849db83ddf7f94a370adeffc6c8
 DIST gucharmap-15.0.0.tar.gz 1936653 BLAKE2B 4ff592bca75a08e19921c2b08c19ea2693b4652986f2cf77536cf3e056353cf9bfe44e66e15b402552f5ab1b97631f53e07ac10b530164b0ba1d479f70d2b4c2 SHA512 b72f4bf5b6b4d922c91bd1fb58070a5bcdc4364f96144db7446c8a94045158bc3c9e549f1bd3db3f27bb22e6b83a130c73cbd7c737c49a2bb0e2a6a5c8756a66
+DIST gucharmap-15.0.1.tar.gz 1938073 BLAKE2B 0a6b6e76bb60648c591354394d2dfb78f56508dbf7d0b62edb945b8e79b6cbe7f333e7245d374fae9476986e06aee99bca53fe05da6a2e66629e33941fa79bd5 SHA512 77a6cd6bfa4465140a1014c8b1a9783acf6feb656925f319627f3fe5a0e091fa1819d82e3f5ca4f9eaa0c6e6bf8ace66ae6895360b9574a8f9ac7a347c37e103
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-14.0.3.ebuild 1708 BLAKE2B 31654745e590266a69f0e716e884e65eafe3e211a111f4df42092f463d762a16780824710c7bfb40ce2cd85ea83dc7cfc8b81a462596fe9d9a19992d5c71a605 SHA512 af36e8e7e29d0c05db8ed6c6cd36645da80ffb7342e70c15c0f61060cd91ca6583dea5034ae3f2c01102f86f96346c6d4c6c21e826d2a754d5e069b5a847f9c4
 EBUILD gucharmap-15.0.0.ebuild 1696 BLAKE2B f2616d6fd69b90c9691dbd44ba72668c003a8d3f23cde395b924507ac2bd40d204fbb91fc7f935aa94c49babde6ad9a683fbf4995763cc634fbd664b88137dea SHA512 9939ac87a9b7b3278a24f4b7fb1de48f4560027dfdea960085d581efe05356087aa2a388fa96140140a31106267b051559b3fa853d1e6ad3b49a0d557d3194b6
+EBUILD gucharmap-15.0.1.ebuild 1696 BLAKE2B 9e78929bd3294a586b1a3e0adb109e07bac73f415bc879de43695cacbe20be1e8daa60e4fe0a6ed027823f9d523fa9e7d3215d648b1a60f02ac3a0c6bdca9f5b SHA512 6e88519c3015f837f55bfdba68f76e6099c51a71994e2a5527274a5c1ff4fae10d2494609c2022e10758c265f9d3440a21c5527ae51200b9b6c744c2549a66b2
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch b/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch
new file mode 100644
index 000000000000..0664c9f0c546
--- /dev/null
+++ b/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch
@@ -0,0 +1,11 @@
+Avoids file conficts with other API versions being installed on the system.
+--- a/meson.build
++++ b/meson.build
+@@ -78,6 +78,6 @@ libgucharmap_gtk4_soversion = '0'
+ 
+ # i18n
+ 
+-gucharmap_gettext_domain = gucharmap_name
++gucharmap_gettext_domain = libgucharmap_gtk3_api_name
+ 
+ # Directories
diff --git a/gnome-extra/gucharmap/gucharmap-15.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-15.0.1.ebuild
new file mode 100644
index 000000000000..6308b8aae15b
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-15.0.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+UNICODE_VERSION="15.0"
+
+IUSE="+introspection gtk-doc vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="media-libs/freetype:2
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=dev-libs/libpcre2-10.21:=
+	=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=x11-libs/pango-1.42.4-r2[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/14.0.1-install-user-help.patch
+	"${FILESDIR}"/15.0.1-fix-file-conflicts.patch
+)
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcharmap=true
+		-Ddbg=false # in 14.0.1 all this does is pass -ggdb3
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dgtk3=true
+		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}