gentoo auto-resync : 25:03:2023 - 12:50:15

3 files changed, 32 insertions, 8 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 99b4903fbef9..c67562e4c066 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,6 +3,6 @@ AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0
 DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 SHA512 1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
 DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
 EBUILD cairo-1.17.6-r1.ebuild 2374 BLAKE2B 9f1428010f734e2d902feec3ef187cd954b7e90a3f770cc63dd6a9310709e44c99a949ad7e00566a738df53ef33cf28952ed5ae770cb2240908e0d59e2571fbe SHA512 879083cbf4ff217a41739e1f5654d2f4370f77f6028f46aa51d70d9791553c31337bbe626bc60ce0127c23ef3ac68066d42c190f8acc019e14dabb5f502b2652
-EBUILD cairo-1.17.8.ebuild 2472 BLAKE2B fa93ce2df8a7c4ee26b0def9dbbf1873151e5ec55d4d37153d782ff35b976deff0bd634e774b75413bdbe11fc625d1030f3d996db64c056e114b77e15be67b67 SHA512 98ae5860cfc465be567097b9e2aed2a6dfd0cc2dbf1010395b6ebaada612f00a40ab15cd18f7cd7d70b4a6deed68e6985b616bf05d3822fc438b0af9d920dea1
-EBUILD cairo-9999.ebuild 2363 BLAKE2B d3e094fc46eb1ea215f1af2d0f0eb2ddeabb7b463144e3fd542c06018032c4920ad0c24a7c9e14663a636ae84abf944c2356127d0d24d9c4cc3bdfdbb02a70b7 SHA512 65b6ebff43ac6a2a497e07600cc26d13e2b9157da629108b9b26ee3a858e861c606de45f9848791403dee0115a2ad6f0ca3f2f4117ce5fd70b941d0c6473a8b7
+EBUILD cairo-1.17.8.ebuild 2804 BLAKE2B e86658ef948512e52d4da52b5bd844242751ab954c874031b882b72fb0a81b14a68906423101c15876359f607098d8b0b1b83e4d225d7454e16f2663eebe3dfb SHA512 0a34512c43b3a7cddccc0f6e3bc9b612266a6f365bb026e0d4c2421c2e6e9ef12a15ccba9f3d97c00c57222ab198e8e24f63ac667bcb80190db8c69b0c1fde4f
+EBUILD cairo-9999.ebuild 2695 BLAKE2B 77008265dbae681086744ed2b2d9186a361bd8f187219d3e6e680bf894721aca99e9752a3e9cc99b42e4f5d984173ab4e661d2af1a741e477c52b2de2fcc1886 SHA512 d45274ec4a45a87c4c0618a2d3221bf2d98f3dad0c0647ae0311fe15a95b8cb9cb211ad3b7aa2c0be083772e9fcef9a4cd6cfcc6153289f1ae707a615a18bee4
 MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild b/x11-libs/cairo/cairo-1.17.8.ebuild
index c32c5a8d50e5..edc9523e91bc 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -18,8 +18,10 @@ DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug +glib gtk-doc"
-RESTRICT="test" # Test suite has many failures. Requires poppler-glib, which isn't available in multilib
+IUSE="X aqua debug +glib gtk-doc test"
+# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
+# any2ppm tests seem to hang for now.
+RESTRICT="test !test? ( test )"
 
 RDEPEND="
 	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
@@ -37,6 +39,11 @@ RDEPEND="
 		>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl
+		app-text/poppler[cairo]
+		gnome-base/librsvg
+	)
 	X? ( x11-base/xorg-proto )"
 BDEPEND="virtual/pkgconfig"
 
@@ -61,7 +68,8 @@ multilib_src_configure() {
 		-Dxml=disabled
 		-Dzlib=enabled
 
-		-Dtests=disabled
+		# Requires poppler-glib (poppler[cairo]) which isn't available in multilib
+		$(meson_native_use_feature test tests)
 
 		-Dgtk2-utils=disabled
 
@@ -75,6 +83,10 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
+multilib_src_test() {
+	multilib_is_native_abi && meson_src_test
+}
+
 multilib_src_install_all() {
 	einstalldocs
 
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 5ead761e1e7f..21df436410a7 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -18,8 +18,10 @@ DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug +glib gtk-doc"
-RESTRICT="test" # Test suite has many failures. Requires poppler-glib, which isn't available in multilib
+IUSE="X aqua debug +glib gtk-doc test"
+# Tests need more wiring up like e.g. https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
+# any2ppm tests seem to hang for now.
+RESTRICT="test !test? ( test )"
 
 RDEPEND="
 	>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
@@ -37,6 +39,11 @@ RDEPEND="
 		>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl
+		app-text/poppler[cairo]
+		gnome-base/librsvg
+	)
 	X? ( x11-base/xorg-proto )"
 BDEPEND="virtual/pkgconfig"
 
@@ -56,7 +63,8 @@ multilib_src_configure() {
 		-Dxlib-xcb=disabled
 		-Dzlib=enabled
 
-		-Dtests=disabled
+		# Requires poppler-glib (poppler[cairo]) which isn't available in multilib
+		$(meson_native_use_feature test tests)
 
 		-Dgtk2-utils=disabled
 
@@ -70,6 +78,10 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
+multilib_src_test() {
+	multilib_is_native_abi && meson_src_test
+}
+
 multilib_src_install_all() {
 	einstalldocs