gentoo resync : 20.03.2022

3 files changed, 5 insertions, 204 deletions

diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 2fe27d95ce8a..61e217370143 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,5 +1,3 @@
-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.4.1.ebuild 4844 BLAKE2B 4114da371735c30a035c0cb018b28304a78d022e3ee2a391d48a7d09f42ff4d2f7aa06bb5005fcb9425c9a084953a35d0d9f5e5a46ff7c4c63ebc7844dc71e82 SHA512 ba82f014f584f848d6ce8a3ee952679ab8638860f9d7b8e2a73803bcbcf12222dff2dd019145b0376511afd2525ca430396bbe6efed2459dc333983e102baa81
-EBUILD gtk-4.6.0.ebuild 5324 BLAKE2B 00ffd4e5b2a98d04a8a6052bbdfadacae90825274ba9b5558535f5dff9cdbf0afb78b4951c52b09817cc202ec962f77c13669aa0aee9ec701b4db4fb960adbef SHA512 5a5c16e451d66c9120a3b74c40d04fc503671694689e231a08464be62482e50f92eef42b03c7b7327aa2ccfe78a333587abe5cc865f9d1ad0bd3a12ee7b089f0
+DIST gtk-4.6.1.tar.xz 22882528 BLAKE2B 921f57124af67523e9d820427b1f5a099d8dfe14982630437df9a821b9ba25eb3db6aa494e71aea26cec3dca4d76e958e150c515d128bdda51b1812bd7801c2c SHA512 7184c3a541172bcc712c00c0093426c5ff5cc54ad2de8529cfec17f8185966718b18b46cfb6c3d8067535909eb0275cd57e8887d2be7a2af459d14f5efb4d03b
+EBUILD gtk-4.6.1.ebuild 5319 BLAKE2B 9fe1b72fe22ce3ed8fc674dd1ec43e0ecde84273b7896b0813614fa59cdea5f72d62c76495f6b75500c1a75af37c2e7f5af3d9d6d17cfbd8854aced61667eb14 SHA512 d99383b49855da69ae30947db773467581dfe0b369c6197c7228dd5fe0b973125ca190fe7ec507b42bec4acc01d40496db6d8c289791beeba29340daa02a755e
 MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779
diff --git a/gui-libs/gtk/gtk-4.4.1.ebuild b/gui-libs/gtk/gtk-4.4.1.ebuild
deleted file mode 100644
index 4435974a0396..000000000000
--- a/gui-libs/gtk/gtk-4.4.1.ebuild
+++ /dev/null
@@ -1,197 +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 optfeature 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
-	)
-"
-
-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
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.6.0.ebuild b/gui-libs/gtk/gtk-4.6.1.ebuild
index bc4022bf2b84..9950bcb1a49b 100644
--- a/gui-libs/gtk/gtk-4.6.0.ebuild
+++ b/gui-libs/gtk/gtk-4.6.1.ebuild
@@ -16,7 +16,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
@@ -39,8 +39,8 @@ COMMON_DEPEND="
 	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
+		>=dev-libs/wayland-1.20.0
+		>=dev-libs/wayland-protocols-1.23
 		media-libs/mesa[wayland]
 		>=x11-libs/libxkbcommon-0.2
 	)