gentoo auto-resync : 02:12:2023 - 22:56:13

5 files changed, 2 insertions, 216 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e88a652de21b..70c3250fa84b 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,8 +1,5 @@
-AUX 1.17.8-tee-Fix-cairo-wrapper-functions.patch 3881 BLAKE2B 3d1d7f000480dceab90ae1cffd8857d91df3f20eab5467b7ad4261dc020c78ccadf74532ab46c022ff7923a41129519d9ecbe4dfe5363eb03d177ad5cbf9e965 SHA512 a8233a69cfbe8419083b473a6b916c77b38ddcdd74e0068d7321a725bbbd68df1832db829a0ab3f104943419314d040db4aea79ef77d05e78114479756f4d0c7
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
-DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B 6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9 SHA512 86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
 DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B 1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b SHA512 bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40
-EBUILD cairo-1.17.8.ebuild 2797 BLAKE2B d3c7e09dd25a812582c1c7844092755eb06e9ea6962ded49c17da1af16448265cc7750d95f6a7f6bc6d28d592cec59763a5cabec3160795b82ef03458a09a668 SHA512 80e6717c7f4355242dcd9f51952dc30a6d0294820426ad61445e3d6e1bd101f04760e5c9a0adfd6dd868942834798cb97c52b0da7c074945c8128a97fdf8f55b
-EBUILD cairo-1.18.0.ebuild 2708 BLAKE2B b5ea1bff6f22152b7b226cfe3ffec3f9b10c4efed3eca0de35901ad01cff7348cbc8e951ef58c1aeb3b51f54daa78b16ec1605530884e1b8e65b256c32987eec SHA512 4d7f28770e4b58215a10ee315c6a6eaa0667de40dc5ca9bfeee624bd8baa3408aee0948aadfadc74b3b53029341c8b6aa2d112d929558671be36354aff79aeed
-EBUILD cairo-9999.ebuild 2683 BLAKE2B c07c19e2bdef21abe2351da6bbec98b6d81b923f6747a85ace463d85112f141e3781e254bb32f50f9fa89890b7888f18231c99f66c48c09def9e703c6dc31b40 SHA512 2f3f6e042744e1fad1288efc20a630a4df9a679d3b2d27ea1581285a58548271e9b316145c70843689702f71a90428c06e5dc332d2dbacc2db296468e2c3a317
+EBUILD cairo-1.18.0.ebuild 2696 BLAKE2B 5ad605b4c25b0547e7054196037f3879fcc270e2b5a28a32967bb9d9c1973e5d898970503164b7613b94a2673d853aa23db9c3eef2fb44f48799c756002fa94b SHA512 0081b5a19fc1db43a00d5e17d7f792b3da6b82422545eea04f8218c71db34c8cec91fc0f44623c02aefd4cc0688d4199f6f2ee8ce0a8acc67dca1f46217b78ae
+EBUILD cairo-9999.ebuild 2671 BLAKE2B 22b6c97303f3f60e8556ba3677028d96a4beb6cd1e5304ffdd69165fd61858e78b5f936cc204bea01d82ffd22773f7b8cb3ac3e4d9f3d3a3c81d172cc81d734e SHA512 3a4b259eeec228135716af950c88701f9af34e4609ab1f78e2afec2401a587715611b346a735dd8d0be10fea5230ca646d8a58addcfe752209e6ec0787d95018
 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
deleted file mode 100644
index 0a245be4edad..000000000000
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
-	SRC_URI=""
-else
-	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-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 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}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
-	debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=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
-	gtk-doc? ( dev-util/gtk-doc )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-
-	# Upstream
-	"${FILESDIR}"/${PV}-tee-Fix-cairo-wrapper-functions.patch
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddwrite=disabled
-		-Dfontconfig=enabled
-		-Dfreetype=enabled
-		-Dpng=enabled
-		$(meson_feature aqua quartz)
-		$(meson_feature X tee)
-		$(meson_feature X xcb)
-		$(meson_feature X xlib)
-		-Dxlib-xcb=disabled
-		-Dxml=disabled
-		-Dzlib=enabled
-
-		# Requires poppler-glib (poppler[cairo]) which isn't available in multilib
-		$(meson_native_use_feature test tests)
-
-		-Dgtk2-utils=disabled
-
-		$(meson_feature glib)
-		-Dspectre=disabled # only used for tests
-		$(meson_feature debug symbol-lookup)
-
-		$(meson_use gtk-doc gtk_doc)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && meson_src_test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
-		mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
-		rmdir "${ED}"/usr/share/gtk-doc/html || die
-	fi
-}
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild b/x11-libs/cairo/cairo-1.18.0.ebuild
index 40384eee69d7..080fd2318b5c 100644
--- a/x11-libs/cairo/cairo-1.18.0.ebuild
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -8,7 +8,6 @@ inherit meson-multilib
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
-	SRC_URI=""
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 7abcac37db5a..f51355062fef 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -8,7 +8,6 @@ inherit meson-multilib
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"
-	SRC_URI=""
 else
 	SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
deleted file mode 100644
index a9bf577f9616..000000000000
--- a/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Fri, 3 Feb 2023 15:40:12 +0100
-Subject: [PATCH] tee: Fix cairo wrapper functions
-
-Follow-up to !391 to apply the same changes to the (disabled by default)
-tee surface.
-
-Fixes: #634
----
- src/cairo-tee-surface.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c
-index 7a94c9bca..4994a5a60 100644
---- a/src/cairo-tee-surface.c
-+++ b/src/cairo-tee-surface.c
-@@ -220,12 +220,12 @@ _cairo_tee_surface_paint (void			*abstract_surface,
-     num_slaves = _cairo_array_num_elements (&surface->slaves);
-     slaves = _cairo_array_index (&surface->slaves, 0);
-     for (n = 0; n < num_slaves; n++) {
--	status = _cairo_surface_wrapper_paint (&slaves[n], op, source, clip);
-+	status = _cairo_surface_wrapper_paint (&slaves[n], op, source, 0, clip);
- 	if (unlikely (status))
- 	    return status;
-     }
- 
--    return _cairo_surface_wrapper_paint (&surface->master, op, source, clip);
-+    return _cairo_surface_wrapper_paint (&surface->master, op, source, 0, clip);
- }
- 
- static cairo_int_status_t
-@@ -244,13 +244,17 @@ _cairo_tee_surface_mask (void			*abstract_surface,
-     slaves = _cairo_array_index (&surface->slaves, 0);
-     for (n = 0; n < num_slaves; n++) {
- 	status = _cairo_surface_wrapper_mask (&slaves[n],
--					      op, source, mask, clip);
-+					      op, source, 0,
-+                                              mask, 0,
-+                                              clip);
- 	if (unlikely (status))
- 	    return status;
-     }
- 
-     return _cairo_surface_wrapper_mask (&surface->master,
--					op, source, mask, clip);
-+					op, source, 0,
-+                                        mask, 0,
-+                                        clip);
- }
- 
- static cairo_int_status_t
-@@ -274,7 +278,7 @@ _cairo_tee_surface_stroke (void				*abstract_surface,
-     slaves = _cairo_array_index (&surface->slaves, 0);
-     for (n = 0; n < num_slaves; n++) {
- 	status = _cairo_surface_wrapper_stroke (&slaves[n],
--						op, source,
-+						op, source, 0,
- 						path, style,
- 						ctm, ctm_inverse,
- 						tolerance, antialias,
-@@ -284,7 +288,7 @@ _cairo_tee_surface_stroke (void				*abstract_surface,
-     }
- 
-     return _cairo_surface_wrapper_stroke (&surface->master,
--					  op, source,
-+					  op, source, 0,
- 					  path, style,
- 					  ctm, ctm_inverse,
- 					  tolerance, antialias,
-@@ -310,7 +314,7 @@ _cairo_tee_surface_fill (void				*abstract_surface,
-     slaves = _cairo_array_index (&surface->slaves, 0);
-     for (n = 0; n < num_slaves; n++) {
- 	status = _cairo_surface_wrapper_fill (&slaves[n],
--					      op, source,
-+					      op, source, 0,
- 					      path, fill_rule,
- 					      tolerance, antialias,
- 					      clip);
-@@ -319,7 +323,7 @@ _cairo_tee_surface_fill (void				*abstract_surface,
-     }
- 
-     return _cairo_surface_wrapper_fill (&surface->master,
--					op, source,
-+					op, source, 0,
- 					path, fill_rule,
- 					tolerance, antialias,
- 					clip);
-@@ -361,7 +365,7 @@ _cairo_tee_surface_show_text_glyphs (void		    *abstract_surface,
-     for (n = 0; n < num_slaves; n++) {
- 	memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
- 	status = _cairo_surface_wrapper_show_text_glyphs (&slaves[n], op,
--							  source,
-+							  source, 0,
- 							  utf8, utf8_len,
- 							  glyphs_copy, num_glyphs,
- 							  clusters, num_clusters,
-@@ -374,7 +378,7 @@ _cairo_tee_surface_show_text_glyphs (void		    *abstract_surface,
- 
-     memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
-     status = _cairo_surface_wrapper_show_text_glyphs (&surface->master, op,
--						      source,
-+						      source, 0,
- 						      utf8, utf8_len,
- 						      glyphs_copy, num_glyphs,
- 						      clusters, num_clusters,
--- 
-2.39.2
-