gentoo auto-resync : 14:03:2023 - 00:16:42

4 files changed, 3 insertions, 107 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e8324761803f..5acc5b2848cb 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -2,8 +2,7 @@ AUX 1.17.8-tee-Fix-cairo-wrapper-functions.patch 3881 BLAKE2B 3d1d7f000480dceab9
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 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 2375 BLAKE2B ac648f13bff7a929d4121ec3095d2bf58b320bf37440bb49ee2d373defb28bc29219de0885f3f6397fa3adfe296f73e8aa74a05aa000e87ac4171478b694771c SHA512 289c1424811ea0d8605a07015e60aa0f71bd2988b6c7581f126dfc6e386bfbc78860fb3ab95a575c632c5783f60da5b8300841f5804a15bfe68eaf94e7030c99
-EBUILD cairo-1.17.6.ebuild 2835 BLAKE2B 6d3239007d7bfa930aef8921756a95f68fafc4e316d48c9e65333313779f8fdb9839505dac7067869511b2f81336dbba254f8c2b366ddcb2f3937c809a3666c8 SHA512 a8195ce1e421200eca17618fcd768697ae78910deae20e97e8644cb1476ca1dd82979d8835902bd5a870855d099e98123fa8318fbf2e0ec819ab539bce9b52ea
+EBUILD cairo-1.17.6-r1.ebuild 2374 BLAKE2B 9f1428010f734e2d902feec3ef187cd954b7e90a3f770cc63dd6a9310709e44c99a949ad7e00566a738df53ef33cf28952ed5ae770cb2240908e0d59e2571fbe SHA512 879083cbf4ff217a41739e1f5654d2f4370f77f6028f46aa51d70d9791553c31337bbe626bc60ce0127c23ef3ac68066d42c190f8acc019e14dabb5f502b2652
 EBUILD cairo-1.17.8.ebuild 2474 BLAKE2B beeddbbc81d1bb0417ecdccfc5b38006f98da053ca32e3d0c9057631a37d043f14caafac72052278825225a71b0133fc9132f0cf711d8be508fc016c90daec0e SHA512 f2df956be6c98db0aced517832e5ba7125bf626295860c4f4c0f69ef381b72c5ad8698a8bd31819c402721f3dc9bc657f35cca7317d2f54ba251284d061ec496
 EBUILD cairo-9999.ebuild 2382 BLAKE2B b8f4df85966a21baa6bb29f18f8f969e2a839b79aa9dd7513a497341e7ae6ad518f297094f3cec4a74bf24af910421ecec23f16be6f4c4ae97e0d923aad4c861 SHA512 1f69ef6585c3e33deef78806fc35fa35fb39e56d7eadc39b6c92e831a8f18ad69eb026e13fe0d313b5e2205e8de2e8ccd39ba509847e32e5a8625fad8e1905b7
-MISC metadata.xml 781 BLAKE2B 93cef84890039f9bbf75544a857cf611b3444fed5f82611d0f180de9c0df4ec5ea468b569cf99d158135354bec1d06c3aab97e139840db7e18d2b0b8ce350731 SHA512 c8008c604fa8956301078eced6c2c355f0205d9fcdfae68da39b1019fa54724239c713cbbd5f44f3d4d1b4d4d21a75248a00e7da4adffbb1974b6c2d36a30ee7
+MISC metadata.xml 484 BLAKE2B 44ea5fe06e0b252b5d0cf71ccf53f76ca6f1f29432886ac0a66af9df19ed72358b91c6ff399ba418d051b5fa5380ff281647ffd050f1471578699ddfa87085ab SHA512 a575a5e6f807ac4527dbcf62e6e4a70c0e6012a6b52d7772ab167ffc29a55718bd35e52b1d0bf61be89ed82f38959e63e7ef198e7b2c1f48889df9dd2c4c8988
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index b5f91f28230d..a44a2cd3aa6a 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild b/x11-libs/cairo/cairo-1.17.6.ebuild
deleted file mode 100644
index 156fa08987a5..000000000000
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 gles2-only gles3 +glib gtk-doc opengl test"
-REQUIRED_USE="
-	gles2-only? ( !opengl )
-	gles3? ( gles2-only )
-"
-RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available in multilib
-
-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}] )
-	gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${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}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-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
-
-		$(meson_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)
-	)
-
-	if use opengl; then
-		emesonargs+=(-Dgl-backend=gl)
-	elif use gles2-only; then
-		if use gles3; then
-			emesonargs+=(-Dgl-backend=glesv3)
-		else
-			emesonargs+=(-Dgl-backend=glesv2)
-		fi
-	else
-		emesonargs+=(-Dgl-backend=disabled)
-	fi
-
-	meson_src_configure
-}
-
-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/metadata.xml b/x11-libs/cairo/metadata.xml
index bdaadf1326b7..8b4901f0d9a8 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -6,9 +6,6 @@
     <name>X11</name>
   </maintainer>
   <use>
-    <flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag>
-    <flag name="gles2-only">Build the OpenGL ES 2 backend</flag>
-    <flag name="gles3" restrict="&gt;=x11-libs/cairo-1.17">Use OpenGL ES 3.0 features (instead of ES 2.0; requires USE=gles2-only)</flag>
     <flag name="glib">Compile with GLib Object System support</flag>
   </use>
   <upstream>