gentoo resync : 29.12.2022

2 files changed, 15 insertions, 13 deletions

diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 2f174f9b6604..6019f70d9ab0 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-1.26.4.tar.xz 5403168 BLAKE2B 642179423cc5f883f1920e90fafc3119fb735d2d7045d120e73b5a82bfec8750101e0cea51f5241f5326b801d5f881ffcc334d565184145e01b019c9350315b5 SHA512 6d43ac09df7671fa2bda74d1231166e8331f3ef1dbe0d167225033b3ddae7377d1062db81b73fc498c2e9f0db467bf4febb7306a6f40c9ef0266dac2a397f43a
-EBUILD clutter-1.26.4.ebuild 2924 BLAKE2B 7dd5effa9dc73a42c023340916f38e1afc7fe05b558cf54d1ed918a53dbf5f809993ede291159f1817ffc46b2ae19874dc7f129268d8c4d14269f83b9baa92b8 SHA512 8aee1c4249d46bd9fdda6f0f69cac057a18fd4c62c28b9abaf3cae2810744624c1406950c251ca50e16742584f85bb13c3b6753ee803157b8b116f54eec24540
+EBUILD clutter-1.26.4-r1.ebuild 2901 BLAKE2B 8df89c8b9fa51eeeeb1d42ab44c8cb8dff67f0da1813285671670a0d7fb4f43be1b523bd8a85df24754dd5a61de4c69d5e17c8a2224cf9c9a50ed29fc1728a1f SHA512 74ff391e11c02e0114fd14a19a00cc6065bea21b417b556e4dc1e49314ffbfdd9eb1878c5fa3474c5ee3015e598ad7aef924c08a024e502fd7603dd56dc12a84
 MISC metadata.xml 405 BLAKE2B 1334c030265f2ef26dd6200dbaa8d747796d806a18817846aae94a103a5885a52b226f3a411617df01b2ac8b711827dd964f4af8df254bd1e7b47868c2db1bed SHA512 4547ab055b744f734592bce54913b2dd9f723484412fd34b92ccfc6cccf07859632b04489d067844305dbf35fbd0b7434bf191d84deab3e678998065bf1a7487
diff --git a/media-libs/clutter/clutter-1.26.4.ebuild b/media-libs/clutter/clutter-1.26.4-r1.ebuild
index cf8a1f4f2a18..7501ce0deb16 100644
--- a/media-libs/clutter/clutter-1.26.4.ebuild
+++ b/media-libs/clutter/clutter-1.26.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=8
 
 inherit gnome2 virtualx
 
@@ -11,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
 
 LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
-
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="aqua debug doc egl gtk +introspection test wayland X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -19,8 +18,6 @@ REQUIRED_USE="
 	wayland? ( egl )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # >=libX11-1.3.1 needed for X Generic Event support
 # do not depend on tslib, it does not build and is disabled by default upstream
@@ -49,12 +46,18 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXdamage
 		>=x11-libs/libXi-1.3
-		>=x11-libs/libXcomposite-0.4 )
+		>=x11-libs/libXcomposite-0.4
+	)
 	wayland? (
 		dev-libs/wayland
-		x11-libs/gdk-pixbuf:2 )
+		x11-libs/gdk-pixbuf:2
+	)
 "
 DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	test? ( x11-libs/gdk-pixbuf )
+"
+BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.17
@@ -62,9 +65,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		>=dev-util/gtk-doc-1.20
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-	X? ( x11-base/xorg-proto )
-	test? ( x11-libs/gdk-pixbuf )
+		dev-libs/libxslt
+	)
 "
 
 src_prepare() {
@@ -89,8 +91,8 @@ src_configure() {
 		--disable-cex100-backend \
 		--disable-win32-backend \
 		--disable-tslib-input \
+		--enable-debug=$(usex debug yes minimum) \
 		$(use_enable aqua quartz-backend) \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
 		$(use_enable doc docs) \
 		$(use_enable egl egl-backend) \
 		$(use_enable egl evdev-input) \