gentoo auto-resync : 29:11:2023 - 10:51:05

5 files changed, 2 insertions, 188 deletions

diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 9e458670d1e6..b54bdd3f2864 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,8 +1,3 @@
-AUX pycairo-1.25.0-init.patch 1409 BLAKE2B 3d72e812e8f5fd25afbf210520bb0f4eabe3bc10e7363336d5ac02fc06527ba42a507012d7e9f29bd1ba978d25bdd14ced6f9e45afd04b66618ef1026b826e49 SHA512 e6f9c25f1959e91016b629fe2cdd8f993165c95664652ba9716965a158a938d556a3f69c0e1c7ad129589bd0c1b9d45fc8a70398d6c474039766d9b2e95f6f48
-DIST pycairo-1.24.0.tar.gz 344850 BLAKE2B f1469254ccfcb96ee5e39af49fcae575717e2f0e9a3dc74a13408306b5c94f4557a9c6d6a448541cb1f6dd27781e484b37d5ea9f230dc87f9d3370fac31dfdba SHA512 bbc160bc9c3c9365018c680f6a69347bc222cdaec10ea48d18aedd0341048df74973d3299d783662adf02b414874824660da10943d88f64c30451d3fdccc63fb
-DIST pycairo-1.25.0.tar.gz 347794 BLAKE2B d05c1f505059c181d176b533ff4753e90888189160b1904531da4d9e9b784976442acb8c848be48d23e04f1fd07fef88a05b374c833ecee1c0b0e2881dadd4d0 SHA512 f34df509d36fbc739e8ddb40e2ead473db6970eacb7a2b0ccad8b82fd41a5daa25c89a5d34e7f2b2b70c4bf74e4e9d87465414aa414280e0aa7a4787b05712da
 DIST pycairo-1.25.1.tar.gz 347088 BLAKE2B ba4eedaf47e514bd7c3ad5ea738d099428958988a708255f59df48372d112d0195fe746be03de56aa25ccce9c2366b8898fcdd568b427372d0340c5edd550a5c SHA512 f2b93a09cbe9cd7c2885794ff58a48df6cf59fbe2dbeabf7c6e9d99e68c71ac220abc866ac0d756c7ffb3f821ef63b65dbb8963f0bf7d5bd21ee0efb800e7b23
-EBUILD pycairo-1.24.0.ebuild 1236 BLAKE2B aea95e9f30aaed453d16742bb76d65d14d4f096b072ac52ec17fb74e9abefed183a633dae265ce34e018f5c0f1fb96d6732c5f9ee75003ebd8e0cd13cd72e21b SHA512 fa792fc7a89962c9e0ccbfeabd0845838be04de7e46ee0a2601de8cd36bc8eb77fa0652f1cbb2255f66333db128cebe212cafe202a0861a444c4fdf76641e397
-EBUILD pycairo-1.25.0.ebuild 1582 BLAKE2B 553d84520a56452099ca7c8869c66266fcfb5a2d6665613b8bf32dfce8f6f2d2131841ae1526bdb3eea0a7b8f413f85bd4ee6e6701c41ca6ce5aa3632dcb820c SHA512 c937c8249a4c904f301a6e0ee959dce0c58a8c848bfe957a36a42f7d9f3b6278f4902ad49efa7c6113a04624cec09c745f7d1718747bc9c5ad58dd5de6fc5ee8
-EBUILD pycairo-1.25.1.ebuild 1532 BLAKE2B ac5d6cc983773e81e01a9f2d916703edbb3189ed0542a395658c66fd3fcb0f266565ae29d997770e329121b2cb7a69f4e4df0ae322848920cf6803551207cae9 SHA512 f419d56f26651938e582f5e5e65148105b6f738d499e3e1d90d118409ad6b58d3af88a1546784ba4c08f9b5e38184255e085d174c38386b3b5fdc606adc6e761
+EBUILD pycairo-1.25.1.ebuild 1530 BLAKE2B ffdc565e7e1b9c862c8e88394c58069825260125babb756f083231153c2033a1e1413bd440f8f88483822d3781f9e67a3ea9a527ad2d84ddc9f51abd31521e06 SHA512 8b17b784a8930f21c94fdb7fc0b356b128872fe0259dd68cef20a2b9f7d9541b729f04124e5c0cedb1acf38d954be5bc592ab6ad70502d2866b69689f2620848
 MISC metadata.xml 368 BLAKE2B 5e0f85e23bc56113927d28072c7178d27fc058b1e90851150c55e9e713edb96dd5daa79df8423f6719032538c9448d8afa9b750961bd82a5bcfae2d5e228c6b6 SHA512 c1e81ed2f535c8050f18950a57b71aa871b965c57d1e5ca8e8a4c48ecd643bc9ec326e046c1aea9f3f41124b9fe765a0b9b46a541c28f325cae7038cea66d086
diff --git a/dev-python/pycairo/files/pycairo-1.25.0-init.patch b/dev-python/pycairo/files/pycairo-1.25.0-init.patch
deleted file mode 100644
index cc670618a261..000000000000
--- a/dev-python/pycairo/files/pycairo-1.25.0-init.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1ef1ea2f0ba3854309114a2395734c34a1e158d8 Mon Sep 17 00:00:00 2001
-From: Tycho Andersen <tycho@tycho.pizza>
-Date: Mon, 16 Oct 2023 20:01:52 -0600
-Subject: [PATCH] module: reorder cairo script surface initialization
-
-PyType_Ready() expects subclasses to be initialized after base classes.
-Since ScriptSurface inherits from Surface, Surface must be initialized
-first.
-
-This causes a segfault in pypy3.10, and the fix was suggested here:
-
-https://foss.heptapod.net/pypy/pypy/-/issues/4017#note_332375
-
-This fixes the seg fault for me.
-
-Signed-off-by: Tycho Andersen <tycho@tycho.pizza>
----
- cairo/cairomodule.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cairo/cairomodule.c b/cairo/cairomodule.c
-index 0026a0e..f27330f 100644
---- a/cairo/cairomodule.c
-+++ b/cairo/cairomodule.c
-@@ -210,6 +210,9 @@ PYCAIRO_MODINIT_FUNC PyInit__cairo(void)
-   if (PyType_Ready(&PycairoTextExtents_Type) < 0)
-     return NULL;
- 
-+  if (PyType_Ready(&PycairoSurface_Type) < 0)
-+    return NULL;
-+
- #ifdef CAIRO_HAS_SCRIPT_SURFACE
-   if (PyType_Ready(&PycairoScriptDevice_Type) < 0)
-     return NULL;
-@@ -223,8 +226,6 @@ PYCAIRO_MODINIT_FUNC PyInit__cairo(void)
-   if (PyType_Ready(&PycairoScaledFont_Type) < 0)
-     return NULL;
- 
--  if (PyType_Ready(&PycairoSurface_Type) < 0)
--    return NULL;
- #ifdef CAIRO_HAS_IMAGE_SURFACE
-   if (PyType_Ready(&PycairoImageSurface_Type) < 0)
-     return NULL;
diff --git a/dev-python/pycairo/pycairo-1.24.0.ebuild b/dev-python/pycairo/pycairo-1.24.0.ebuild
deleted file mode 100644
index e700120bce9f..000000000000
--- a/dev-python/pycairo/pycairo-1.24.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
-	https://www.cairographics.org/pycairo/
-	https://github.com/pygobject/pycairo/
-	https://pypi.org/project/pycairo/
-"
-SRC_URI="
-	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	esetup.py build_tests
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.25.0.ebuild b/dev-python/pycairo/pycairo-1.25.0.ebuild
deleted file mode 100644
index 566314d24f35..000000000000
--- a/dev-python/pycairo/pycairo-1.25.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
-	https://www.cairographics.org/pycairo/
-	https://github.com/pygobject/pycairo/
-	https://pypi.org/project/pycairo/
-"
-SRC_URI="
-	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-init.patch"
-)
-
-python_test() {
-	esetup.py build_tests
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# we need to pass --root via install command, sigh
-	cat > "${T}/distutils-extra.cfg" <<-EOF || die
-		[install]
-		root = ${D}
-	EOF
-	local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg
-	esetup.py \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/include/pycairo
-	newins cairo/pycairo.h py3cairo.h
-}
diff --git a/dev-python/pycairo/pycairo-1.25.1.ebuild b/dev-python/pycairo/pycairo-1.25.1.ebuild
index 0f80864403f4..36802a446420 100644
--- a/dev-python/pycairo/pycairo-1.25.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.25.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="