6 files changed, 228 insertions, 2 deletions
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 602fade020b7..f067bae1ce4e 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index dd29f00321b6..3fb2025efb4f 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,3 +1,6 @@
+AUX 4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch 1027 BLAKE2B 8950ff94185667d5271eadbad5cb2db05a9edbae7fc986453979f2728e47a5575fe31d3f4e43f1a3818c866d421194c550a39d9a495e6c0e3a9ff49d668d1597 SHA512 84c62950c12e29bc2898e58fa7e26ba8be3f6597a2db1be05d2fa5eab03394d6fbaadd2cc2775a017f13d98882846d08c2e2ba9291b249ea075c71e7c15f91ce
 DIST gtk-4.2.1.tar.xz 25809520 BLAKE2B 63183950703375b092ce451be93d16d1149eb2095b5f304578a064422821546ae161235b46617647cd67a7d8898e2c3854d87bf31ede0cd6db2138d7e5c36c30 SHA512 a2721d6b9a72be481460081aedfbd713842cb5abdb24d810ec48e346342d0d91271f4ace321a9697214477ad4829d0b0ca67754ea316e719784f01c43f0fe732
+DIST gtk-4.4.0.tar.xz 30008844 BLAKE2B 5fa6e8236772847961e09f282efed5386017e6ea7d0c78f310c90c93cc42b1c27fbc6c1a93f624b38365ecca8d6632af9b191ba2a3a4bcd8aa07907e842c85c9 SHA512 de0b6508df3fa4523a7e54cf417ac31292c833346409ff89fd4daf886edad16ffe60b6ed77a85451bd36b96098c8437d56c6fd42daca33c52db8dc57a25753b6
 EBUILD gtk-4.2.1-r1.ebuild 4728 BLAKE2B 37a934bec76c3873609c2fea885cade94b7360fb0fd7ed98c8196e74477ad3e30fadda4dd73c1a5cff8cd26aaef2b6d54907ebbc3ec52280500627206ee74a2e SHA512 5dfd6053ddf368e9ea0a2fad4acf5ac7245fe533d945f80c2c7554057590f4b5b83f5477f3c8e59affb8d277479ed61abaaf1af5eb463436abdfd2267686d7d1
+EBUILD gtk-4.4.0.ebuild 4777 BLAKE2B 13d2514b51b53cfdb0b4b2662835714990d40b5d3080286d94b7ce0b07c827f1e54f52a5f13ce28c4bf4329c5a8937833167d41e2f82f27a601bb736c2da861c SHA512 04434c515997e1876a2c35176113e7426ef493fc44dff922e3df1c7ff8a689a5660b17dfbb30afcb7ff6279173a935cc76cce611880ecfce0a708b432c3e578e
 MISC metadata.xml 762 BLAKE2B ba9cb841a877cab910c5517bd4ddd5ade8eeeee9730842412ea371c745a90c5b69d06d95d2f77adff6b90daff589173525914139bb6bde699f241c3ddaa5662b SHA512 8678e380c257cb7cdbee752bec79bc53632b453bbb72a6c05c9ecbd791285e964ea3a57197dd247b0cd881757f3e5210551755e043126a3db9913f96a0f142ae
diff --git a/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch b/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch
new file mode 100644
index 000000000000..1292e85cefa1
--- /dev/null
+++ b/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch
@@ -0,0 +1,29 @@
+From 552a4b2c82f41c1dbba410b825673cf67d089b68 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Mon, 23 Aug 2021 15:38:46 +0200
+Subject: [PATCH] build: Fix detection for pre-compiled css files
+
+The default theme changed from Adwaita to Default and this tripped up
+the logic to detect if the tarball builds contain pre-built css files or
+not. Fix this by looking at pre-compiled css files in themes/Default/
+instead of themes/Adwaita/.
+---
+ gtk/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/meson.build b/gtk/meson.build
+index fa66764c50..bfb5105fe5 100644
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -842,7 +842,7 @@ gtk_gresources_xml = configure_file(output: 'gtk.gresources.xml',
+ 
+ theme_deps = []
+ # For git checkouts, but not for tarballs...
+-if not fs.exists('theme/Adwaita/Adwaita.css')
++if not fs.exists('theme/Default/Default-light.css')
+   # ... build the theme files
+   sassc = find_program('sassc', required: false)
+   if not sassc.found()
+-- 
+2.31.1
+
diff --git a/gui-libs/gtk/gtk-4.4.0.ebuild b/gui-libs/gtk/gtk-4.4.0.ebuild
new file mode 100644
index 000000000000..f0a65fdf2fe6
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.4.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway colord cups examples ffmpeg gstreamer gtk-doc +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	gtk-doc? ( introspection )
+	test? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/fribidi-0.19.7
+	>=dev-libs/glib-2.66.0:2
+	>=media-libs/graphene-1.9.1[introspection?]
+	>=media-libs/libepoxy-1.4[X(+)?]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	>=x11-libs/pango-1.47.0[introspection?]
+	>=media-libs/harfbuzz-2.1.0:=
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-2.0 )
+	ffmpeg? ( media-video/ffmpeg )
+	gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	vulkan? ( media-libs/vulkan-loader:= )
+	wayland? (
+		>=dev-libs/wayland-1.16.91
+		>=dev-libs/wayland-protocols-1.21
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3
+		media-libs/fontconfig
+		media-libs/mesa[X(+)]
+		x11-libs/libX11
+		>=x11-libs/libXi-1.3
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.5
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		dev-util/gi-docgen
+	)
+	test? (
+		dev-libs/glib:2
+		wayland? ( dev-libs/weston[headless] )
+
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-build-Fix-detection-for-pre-compiled-css-files.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		# GDK backends
+		$(meson_use X x11-backend)
+		$(meson_use wayland wayland-backend)
+		$(meson_use broadway broadway-backend)
+		-Dwin32-backend=false
+		$(meson_use aqua macos-backend)
+
+		# Media backends
+		$(meson_feature ffmpeg media-ffmpeg)
+		$(meson_feature gstreamer media-gstreamer)
+
+		# Print backends
+		$(meson_feature cups print-cups)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
+		$(meson_feature sysprof)
+		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+		$(meson_feature colord)
+		# Expected to fail with GCC < 11
+		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+		$(meson_feature cpu_flags_x86_f16c f16c)
+
+		# Documentation and introspection
+		$(meson_use gtk-doc gtk_doc)
+		-Dman-pages=true
+		$(meson_feature introspection)
+
+		# Demos and binaries
+		$(meson_use examples build-examples)
+		$(meson_use examples demos)
+		$(meson_use test build-tests)
+		-Dinstall-tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	if use X; then
+		einfo "Running tests under X"
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
+	fi
+
+	if use wayland; then
+		einfo "Running tests under Weston"
+
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-5
+
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
+
+		exit_code=$?
+		kill ${compositor}
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc ; then
+		mkdir "${ED}"/usr/share/doc/${PF}/html || die
+
+		local docdirs=( gdk4 gsk4 gtk4 )
+		use wayland && docdirs+=( gdk4-wayland )
+		use X && docdirs+=( gdk4-x11 )
+
+		local d
+		for d in "${docdirs[@]}"; do
+			mv "${ED}"/usr/share/doc/{${d},${PF}/html/} || die
+		done
+	fi
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 1fc253fdc93e..a84087e1f0f1 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,3 @@
 DIST libhandy-1.2.3.tar.xz 491024 BLAKE2B b15e4b12135230ce6e588e005f55edada001abaa3fbdcf2f05b5e05f364beaa8983239f3a562b8600fc07edd6b6b7e834d42a06ec1ec626d7a43d6634ba93d0e SHA512 20ed6708bb517c81d9b8520c522555d7cdaf36f19dd29603a4f86d6d47ec2552af8874605b1866eb634d25afd0a2c18690cb1be6eafce81cac7857890388799e
-EBUILD libhandy-1.2.3.ebuild 1245 BLAKE2B 54b5828a1d8a93caf902fb91b0398bc315e707e12ac211f4f9541bb3fe008f7d1701f3bfec9d841306df9b93b3998be3b1e82f284e05b8bacaa0526e81221328 SHA512 c0a3d0e87fb45b874271695706d5680e2d8f6f521fb62a3896929deda2d810fa094f8e79c62a9f22d14aeea8f74d1d5b0a1dbafc2fa54861f0476f30ad182e0e
+EBUILD libhandy-1.2.3.ebuild 1252 BLAKE2B 5814f642e831a947f7758f79f1888d043f9ad706c1f2f0b683d94bcab7426231fa4b5101d8c53bd1268ffdb809d68178b0a1174f94ba3a9666f7aa2a5001d3cf SHA512 6169f4e5f1ce8f44985a5fae50bd9b045218ec8bba61bff2b2387da45784266c03e7b6435db518b41794f8c9de707a3327c8d13517d4e0510808090c6fcb2c9a
 MISC metadata.xml 353 BLAKE2B 7857afbafa45ea4d3230afa20992cf7196bdd23430ba09bd032b5965b3ce6b7ebadf8122b412549a84d798107adbce3f0b1d6ed79975f315889f7a7700187504 SHA512 f54a7b013a4b5f2e94efda2de95f8063a8755fb2162262a2734ea561fa10cd48be737ddbc3ab7ea93f5d1cf3f59dd91c70da25db5d331828aa74194109c5d36f
diff --git a/gui-libs/libhandy/libhandy-1.2.3.ebuild b/gui-libs/libhandy/libhandy-1.2.3.ebuild
index 4caad0a11e8b..d3a9d885a019 100644
--- a/gui-libs/libhandy/libhandy-1.2.3.ebuild
+++ b/gui-libs/libhandy/libhandy-1.2.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"