gentoo resync : 02.02.2022

6 files changed, 4 insertions, 431 deletions

diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 62b93d6371d6..2fe27d95ce8a 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,10 +1,5 @@
-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
 DIST gtk-4.4.1.tar.xz 30031924 BLAKE2B c64d8c015e7cc2a0f21274af70be856bb37ef771af5df8ab8698455c70d25a02d6535a06718307c5c312915b4c3218c4d86f4d799d27e1b8ae4c0e877e218ee8 SHA512 4edf9c5c24a1853713dfabdf9a8853eca4477fdd64b391f55c25d8937bfa7e78fb2e357067dee30aebbc245a099244c637d07965a34a0bff51f090b8f45e3d16
 DIST gtk-4.6.0.tar.xz 22655868 BLAKE2B 197766af8b874cd0598eab1b2289ca329a61990240be55a07be13e25f1d35740ca220d099e1afa57a9c927818f4d2033ab287ea146d52567e696cf5db3f24e88 SHA512 9531d7183c46bd89e213eae6cfd64821536d1f4fe7371a5fef835e31cf2c8b3d5152baebe44633d0a69d3e1ddc34ef1e90123d6e7de9aa3f44d6e70dc83369fa
-EBUILD gtk-4.2.1-r1.ebuild 4728 BLAKE2B 37a934bec76c3873609c2fea885cade94b7360fb0fd7ed98c8196e74477ad3e30fadda4dd73c1a5cff8cd26aaef2b6d54907ebbc3ec52280500627206ee74a2e SHA512 5dfd6053ddf368e9ea0a2fad4acf5ac7245fe533d945f80c2c7554057590f4b5b83f5477f3c8e59affb8d277479ed61abaaf1af5eb463436abdfd2267686d7d1
-EBUILD gtk-4.4.0.ebuild 4828 BLAKE2B 5dfb99c89a7a1b8b45d8d3c63669143b4ba8d7017565225ea5e7389fd9ae725492cf99229700f442b31da21abab9bf2fd211573de2252a56db51b3249be0e427 SHA512 0f9d7e7e872c42f36ad73c34c7fcf615c95cf7fd17774e3ef2642a41e27ffce3564c52cd100d55ed3c5a0ef909e89eaf20953fc9c499f12b81dc1c33bcc3e2f5
-EBUILD gtk-4.4.1.ebuild 4848 BLAKE2B 7b752d7d6c02bae8d1cb237a3cdb768f3dfd8a45e64f0d2897a58dd9d9d69e5e26e786eb82d6fc31e69b14b6bbc8c5ef30b0903c297f4c2d08a987a543317d95 SHA512 9c9a0a1e4669733a5fa26a615edc43fe8bb94b02f2d8a42569929adf2c87e1e569b97fb91f415b4d213a5d698bdddad95e940cca23742bd8dc3208fcf64442de
+EBUILD gtk-4.4.1.ebuild 4844 BLAKE2B 4114da371735c30a035c0cb018b28304a78d022e3ee2a391d48a7d09f42ff4d2f7aa06bb5005fcb9425c9a084953a35d0d9f5e5a46ff7c4c63ebc7844dc71e82 SHA512 ba82f014f584f848d6ce8a3ee952679ab8638860f9d7b8e2a73803bcbcf12222dff2dd019145b0376511afd2525ca430396bbe6efed2459dc333983e102baa81
 EBUILD gtk-4.6.0.ebuild 5324 BLAKE2B 00ffd4e5b2a98d04a8a6052bbdfadacae90825274ba9b5558535f5dff9cdbf0afb78b4951c52b09817cc202ec962f77c13669aa0aee9ec701b4db4fb960adbef SHA512 5a5c16e451d66c9120a3b74c40d04fc503671694689e231a08464be62482e50f92eef42b03c7b7327aa2ccfe78a333587abe5cc865f9d1ad0bd3a12ee7b089f0
-MISC metadata.xml 763 BLAKE2B d58b30346f7f45d5d9454650bd02410165458dac8f044a1c47e4769625199bf26e090c415568ccbb83e1cfce07d8b2370cdd801a0a771bcdbc6774dbd12a36a4 SHA512 75d3e7bbb2502832bd3fafc59149896a310334a8161c507c15e3378e97f4fcf4bfd857da4acde685b1faa459087aa178033dbc003b26ad83896bfc7e35ce4f13
+MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779
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
deleted file mode 100644
index 1292e85cefa1..000000000000
--- a/gui-libs/gtk/files/4.4.0-build-Fix-detection-for-pre-compiled-css-files.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.2.1-r1.ebuild b/gui-libs/gtk/gtk-4.2.1-r1.ebuild
deleted file mode 100644
index c6d949ef1027..000000000000
--- a/gui-libs/gtk/gtk-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# 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 cloudprint colord cups examples ffmpeg gstreamer gtk-doc +introspection sysprof test vulkan wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	gtk-doc? ( introspection )
-	xinerama? ( X )
-"
-
-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-0.9:=
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7
-		>=dev-libs/json-glib-1.0
-	)
-	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.14.91
-		>=dev-libs/wayland-protocols-1.20
-		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/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( 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-lang/sassc
-	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 )
-
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc
-	)
-"
-
-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)
-		$(meson_feature cloudprint print-cloudprint)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		$(meson_feature xinerama)
-		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-
-		# 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/gtk/gtk-4.4.0.ebuild b/gui-libs/gtk/gtk-4.4.0.ebuild
deleted file mode 100644
index aaac1d34fc34..000000000000
--- a/gui-libs/gtk/gtk-4.4.0.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# 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() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_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() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.4.1.ebuild b/gui-libs/gtk/gtk-4.4.1.ebuild
index a6873967ff21..4435974a0396 100644
--- a/gui-libs/gtk/gtk-4.4.1.ebuild
+++ b/gui-libs/gtk/gtk-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( introspection )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
diff --git a/gui-libs/gtk/metadata.xml b/gui-libs/gtk/metadata.xml
index 351f606094d0..e89885b87dd9 100644
--- a/gui-libs/gtk/metadata.xml
+++ b/gui-libs/gtk/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="broadway">Enable the GDK Broadway backend.</flag>
-		<flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
 		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
 			in printing</flag>
 		<flag name="sysprof">Enable profiling data capture support using