Merge updates from master

9 files changed, 156 insertions, 5 deletions

diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
index 90ec97155fa5..5cb99f246cd5 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2 pam python-any-r1 virtualx
 
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 49028eb9ca1b..30592c18020b 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1 +1,2 @@
 DIST gnome-font-viewer-41.0.tar.xz 179672 BLAKE2B ce9e91b319ccf2e099cd30cf13e407270775950321e2bea69703050b5797ed879320939d260aba175f3ed6f5719e23f5628c6501f362c3e367ca5ddf70902037 SHA512 09d9ddcdd18fd0023dff46e7197988473119e0d753b7814fdca0116c6831a93146301dd56ee77546121c573c8d93801b5d8fed0c46da47052e31749058c21d50
+DIST gnome-font-viewer-42.0.tar.xz 287644 BLAKE2B 273328298187c1b77882638bb292ca9340a1dc57c917d9888abeadfe8ea01c27d0f59d382823b262323000da81457fb821aafa9b1ba50792ee75ce3dd8de4ee7 SHA512 231aaf594b22741f8a138c0a6c764244eb947f9cf30385353f4dea13cfc7929f21a291f9a56810eb24862310ecab6b4555147ef6be9e7a5d3057ae05ebba76ec
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
new file mode 100644
index 000000000000..13695ffc5105
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=gui-libs/gtk-4.5.0:4
+	>=gui-libs/libadwaita-1.0.0:1=
+	>=media-libs/harfbuzz-0.9.9:=
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	gnome-base/gnome-desktop:4=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 9c22da42fd1f..324d8274f3f3 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1 +1,2 @@
 DIST simple-scan-40.7.tar.xz 1480288 BLAKE2B 8068105db77196157495cbb2eb4c3e6a82531ed4bb727c05884154a661a9669426047c6cbbcffdd696c8e4d27721f2ca6249be14b6b4cc62be96bdbfe1b67a4c SHA512 36dc321e83bdf02fb9267d299abeee7f56bb6ee786e09811ba1244a2cee2c3baa0c5bbf3a4d6a6eadfc093d0e792b3511855c7e32caa2f6864face620fa4e7f6
+DIST simple-scan-42.0.tar.xz 1097464 BLAKE2B e2ca253d6fcff9a320312bbf32e50242b64c22a1f89cf99aa705214c5a393f1e76fb14693f508d0bc7231b97d47a5b7fa3fe767527206615df361c9edf5315c6 SHA512 0ccbe82a85fa802f53899df6109be93d58adc5028e6d904da7fc91e25cfd225fff757a7b65380abd7d3e7dfd35feab586bcf5b7504cc46d42822d3b2179bdec0
diff --git a/media-gfx/simple-scan/simple-scan-42.0.ebuild b/media-gfx/simple-scan/simple-scan-42.0.ebuild
new file mode 100644
index 000000000000..0b16fcd3aa71
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-42.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.24:3
+	>=gui-libs/libhandy-1.5.0:1=
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gui-libs/libhandy:1[vala]
+	dev-libs/libgusb[vala]
+	colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/40.0-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-libs/gexiv2/gexiv2-0.12.2.ebuild b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
index 391e3904bcea..5fc59d4f31ce 100644
--- a/media-libs/gexiv2/gexiv2-0.12.2.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-r1 vala
 
diff --git a/media-libs/gexiv2/gexiv2-0.13.0.ebuild b/media-libs/gexiv2/gexiv2-0.13.0.ebuild
index 00f117fc268d..34ebff1f72da 100644
--- a/media-libs/gexiv2/gexiv2-0.13.0.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-r1 vala
 
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 9c18c67f8133..3b0e05f34092 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1 +1,2 @@
 DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
+DIST baobab-42.0.tar.xz 588392 BLAKE2B ec2525b6643a9ab2ecedcbb7b7a54419859116808d9287bfcc694cf22d314b5dc34e71483718353685f3a246c87b4b492e7c3fb69c7044dea605ae3e8737d0f1 SHA512 21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08
diff --git a/sys-apps/baobab/baobab-42.0.ebuild b/sys-apps/baobab/baobab-42.0.ebuild
new file mode 100644
index 000000000000..8f6502db0c7c
--- /dev/null
+++ b/sys-apps/baobab/baobab-42.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=gui-libs/gtk-4.4.0:4
+	>=gui-libs/libadwaita-1.0.0:1=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	>=gui-libs/libadwaita-1.0.0:1=[vala]
+	dev-util/itstool
+	>=sys-devel/gettext-0.21
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}