gentoo resync : 29.12.2022

2 files changed, 18 insertions, 21 deletions

diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index ff32de099a97..e0797b9caad1 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,4 +1,4 @@
 AUX cogl-1.22.8-slibtool.patch 835 BLAKE2B d0bc0215d785be2b8fbae5afc23b50dc79adc77bb4a1c8e8dcef0104febfad397ddab94f9afe811b9765cd9c829bab4d5282ae95e5f32aaea3ec4e6c2649a651 SHA512 a0478481712f2481f08bcdd2c0feb87c2c1a45fe0e0e37aa00bdeed54ca5376d0dbeafe8b21d9ea28bb326025ccfaefa956683b779cf19f2bfc8524f7b962c97
 DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f
-EBUILD cogl-1.22.8-r1.ebuild 3493 BLAKE2B a1749b36dd318e5bad5044328589112e9e2cd2d5d11c8347bdbd3b22c5f778a2482a811a8114ef4585eff87085969e78f807a504165567824c92d96133fe83ff SHA512 c144d309da57c14c47ea8c15ec8eb9cb531bba95a72043cd36d17769905bc31e60196d5b3b9c1b99c85eb75f1dfa0d5b2f0b7d6237f9c25c3a784f5d9d672a40
+EBUILD cogl-1.22.8-r2.ebuild 3357 BLAKE2B 3ee157a8edfe440b827be1c9b2ef0daeaa18edb423df0042493db5a0ba84d9ac16f565f2782daa3ea32fc53483ad4933cc2fa1fc5ba5e9dffa1d00831553dc8e SHA512 9c6c675be4548204449c3536a0d3c3f1da952c6412ddff9d8141fa4c9144460020cd825c6c1542a659d42da4570d2a5add75c7783e15696b3b00a02e055304ca
 MISC metadata.xml 458 BLAKE2B f10413fbb937bfca31271bfb5e1077125fcab9dc3887224f40d65099c715a5d5a5f40d733749cc096df530c431655c4ecaf94584e0529f9379d7e44482876b9a SHA512 8b332175235249193619499150eb4c714e7ebdb9de9685ca60d8dfdcf73940f36067e5864d0cc328b89abf9a138cd52ac0a77d21d9f9d06a524267199669e32e
diff --git a/media-libs/cogl/cogl-1.22.8-r1.ebuild b/media-libs/cogl/cogl-1.22.8-r2.ebuild
index a5e772c9b85e..89cfdd28232c 100644
--- a/media-libs/cogl/cogl-1.22.8-r1.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r2.ebuild
@@ -1,29 +1,31 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # Temporarily needed for slibtool patch
 # It's upstreamed so should be able to drop in future
 # bug #778041
 GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib
+inherit gnome2
 
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
 HOMEPAGE="https://www.cogl3d.org/"
 
 LICENSE="MIT BSD"
 SLOT="1.0/20" # subslot = .so version
-
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 # doc and profile disable for now due to bugs #484750 and #483332
 IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
 REQUIRED_USE="
 	wayland? ( gles2 )
 	|| ( gles2 opengl )
 "
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.32:2
 	x11-libs/cairo:=
 	>=x11-libs/gdk-pixbuf-2:2
@@ -37,30 +39,26 @@ COMMON_DEPEND="
 	gles2? ( media-libs/mesa[gles2] )
 	gstreamer? (
 		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
+		media-libs/gst-plugins-base:1.0
+	)
 	introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
 	kms? (
 		media-libs/mesa[egl(+),gbm(+)]
-		x11-libs/libdrm:= )
+		x11-libs/libdrm:=
+	)
 	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
 	wayland? (
 		>=dev-libs/wayland-1.1.90
-		media-libs/mesa[egl(+),wayland] )
+		media-libs/mesa[egl(+),wayland]
+	)
 "
-# before clutter-1.7, cogl was part of clutter
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7
-"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19
 	virtual/pkgconfig
 "
 
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For some reason GL3 conformance test all fails again...
-RESTRICT="test"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-slibtool.patch
 )
@@ -100,7 +98,7 @@ src_configure() {
 		$(use_enable gles2)        \
 		$(use_enable gles2 cogl-gles2) \
 		$(use_enable gles2 xlib-egl-platform) \
-		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+		$(usev gles2 --with-default-driver=$(usex opengl gl gles2)) \
 		$(use_enable gstreamer cogl-gst)    \
 		$(use_enable introspection) \
 		$(use_enable kms kms-egl-platform) \
@@ -109,7 +107,6 @@ src_configure() {
 		$(use_enable wayland wayland-egl-platform) \
 		$(use_enable wayland wayland-egl-server) \
 		--disable-profile
-#		$(use_enable profile)
 }
 
 src_install() {
@@ -122,5 +119,5 @@ src_install() {
 	gnome2_src_install
 
 	# Remove silly examples-data directory
-	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+	rm -rvf "${ED}"/usr/share/cogl/examples-data/ || die
 }