gentoo auto-resync : 24:08:2023 - 21:52:33

5 files changed, 2 insertions, 127 deletions

diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 557cff5dcba3..50ad04ad1a44 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,8 +1,4 @@
-AUX reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch 1502 BLAKE2B 79fba12b6219d0a9e3d25140359bd9589af0f501345797d74ed07d6efd0fe239b4ef2a357bb65d16c0544224022323418a4d3f57358433d776a4f2d41b7bbbb1 SHA512 696454cd280fe603ae014b829577cc3fd1b968478cf327528229cdf66dc0069fa2748cbc7b8519b26b170e9f01784523da2862dcc8623d24a8b7695fa3f4d42a
-AUX reportlab-3.6.9-paths.patch 996 BLAKE2B a003ce69d7aff12e04fac914d44a0af58555da9858d96f23be26455836ee1105d76136cdfbe52b888f9779f1b8463fda9a04587b3ef045c8354d840f3f92caac SHA512 f71ebfdb07c87a7bd39a5578355a2a800654204e38f722106dcfbe848332eb1ef6ce8b6ffebe08fd0a07214c0fcfade69e0eee1f47b1055c877efc64e70e0bfc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.6.13.tar.gz 4035524 BLAKE2B 638b670b76b4cfb88c0a66db484f5b4d042fd935798316d02303932503e353a6035419d7ef1c4dccd8ef94b3cc2e13a576fd3cb5461fca17122a800f1140945a SHA512 059c3acf2c995ebdd3ffe005bd98640bc9c063c2fb9b3115351b9c1a4f7cfdabf4ffe61123342de2e84773005d46cf6d44410042206222df0700259e31ec7aae
 DIST reportlab-4.0.4.tar.gz 3132866 BLAKE2B eb1791b248c8c0dc194781ca09dbf181dc20f745ce2fdd3a4627ae027b21baddc0bea56c6e5eefd5905f7656c5a3a388d90310ce53a948ab0a3dbaff569f2d63 SHA512 7d79f6258672523bee50256b5b15e336801fc42f290fa2ed5ed0ab355c9f2903c9210bb935c9c00fa74174072232402247c923268ede5d61ca62493d0faa2844
-EBUILD reportlab-3.6.13.ebuild 1294 BLAKE2B 6400ada3b9c7344574ad60d114510bd7a18b122f49e93c296d3f72682228ba8c62a2c29748da736a385dde891830d72e66ec73b9719e41c13ac1ecc9504fbd2e SHA512 f2ef62bdeedaede42266a6a51e48ecc8c9980255e34a8ad6b5b78ed495c75a59ae7446f77be92ada6d7c92c21e6940e6607c798e3d48b6a6683ffb2909fbf56a
-EBUILD reportlab-4.0.4.ebuild 1090 BLAKE2B c22418771c4a8a72585fdd91e33105e81e2d242b717f519ad48a094de5bdae8c8b8b746592910893b06763dfba4d91518633a05080300ce13b17922b367bdfac SHA512 85b9e84777fc8a6a326d3693e64f028971cd3e46022c8f1cfa3cfa46fdaea426b99d40fc7a720cc020fab30fd18faedd2010df86be8f05f04035fce1ca173354
+EBUILD reportlab-4.0.4.ebuild 1089 BLAKE2B f3478ec743d5c7915b3bdc7626693e561ceed7823fb61e4b5dc789612a2e5aedf6b14400c5413c8d271b673d2c1f59fa79741d6b3cdee2a47239c3bf8540618c SHA512 052b70efe70647c6db16a8af6f7a10b46abb3f25cef077e23c043316af9cc509d659fee9b194617cfbf30423c29daefe789637f8686e4af80edc4d2b20b0b56d
 MISC metadata.xml 1913 BLAKE2B e088a4a5ee1ca40351c04d8ee825fb783679c8c4ac5ba7c513975e546f7f90f4777a7d9b312a4bb2ce97db5695fcfcf913610b02a9780ffc86143ee1845ee281 SHA512 84422b0f54f169b4342bb5842935a57dd7721d8d6e41f4fece4ce0cf20ee70a764fa1914371e47ed9437bd40243ec22c93f20c167a48ee6ba9d9cfbf3e7c1fe8
diff --git a/dev-python/reportlab/files/reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch b/dev-python/reportlab/files/reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch
deleted file mode 100644
index 20a57efcac66..000000000000
--- a/dev-python/reportlab/files/reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Note:  Upstream development is done in HG, not git; this patch was
-generated using the git mirror at
-https://github.com/MrBitBucket/reportlab-mirror.  Attempted to submit to
-reportlab-users mailing list but it rejected my mail server.
-
-From 9ba2380a68e891667a2659e16d0f04ebe0ecfd19 Mon Sep 17 00:00:00 2001
-From: matoro <matoro@users.noreply.github.com>
-Date: Mon, 4 Jul 2022 18:42:18 -0400
-Subject: [PATCH] correct srclen type in gstate__aapixbuf
-
-gstate__aapixbuf calls PyArg_ParseTuple with the format string
-"ddddy#ii|i".  Specifically the key "y#" will try to read a bytes-like
-object and its size into two Python variables.  The latter of these
-should be of type Py_ssize_t as specified by the C API, but here it is
-incorrectly declared as an int.  This was pointed out to me by the
-cpython developers when I mistakenly identified it as a cpython bug and
-submitted a PR there:  https://github.com/python/cpython/issues/94149
----
- src/rl_addons/renderPM/_renderPM.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rl_addons/renderPM/_renderPM.c b/src/rl_addons/renderPM/_renderPM.c
-index c8415595..bc77d766 100644
---- a/src/rl_addons/renderPM/_renderPM.c
-+++ b/src/rl_addons/renderPM/_renderPM.c
-@@ -1319,7 +1319,7 @@ static	void _reverse_rows_inplace( char *buf, int nrows, int stride)
- 
- static PyObject* gstate__aapixbuf(gstateObject* self, PyObject* args)
- {
--	int			srclen;
-+	Py_ssize_t	srclen;
- 	double		ctm[6], dstX, dstY, dstW, dstH;
- 	ArtPixBuf	src;
- 
--- 
-2.37.2
-
diff --git a/dev-python/reportlab/files/reportlab-3.6.9-paths.patch b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch
deleted file mode 100644
index e5ed7c43478d..000000000000
--- a/dev-python/reportlab/files/reportlab-3.6.9-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Disable broken logic for finding freetype2 that hits symlink loops.
-
-diff -dupr reportlab-3.6.9.orig/setup.py reportlab-3.6.9/setup.py
---- reportlab-3.6.9.orig/setup.py	2022-03-28 10:13:33.892516135 +0200
-+++ reportlab-3.6.9/setup.py	2022-03-28 10:49:11.048573739 +0200
-@@ -737,13 +737,10 @@ def main():
-             else:
-                 FT_LIB=FT_LIB_DIR=FT_INC_DIR=FT_MACROS=[]
-         else:
--            ftv, I, L = inc_lib_dirs('freetype')
-             FT_LIB=['freetype']
--            FT_LIB_DIR=L
--            FT_INC_DIR=I
-+            FT_LIB_DIR=[]
-+            FT_INC_DIR=['/usr/include/freetype2']
-             FT_MACROS = [('RENDERPM_FT',None)]
--            infoline('installing with freetype version %s' % ftv)
--            infoline('FT_LIB_DIR=%r FT_INC_DIR=%r' % (FT_LIB_DIR,FT_INC_DIR))
-         if not FT_LIB:
-             infoline('# installing without freetype no ttf, sorry!')
-             infoline('# You need to install a static library version of the freetype2 software')
diff --git a/dev-python/reportlab/reportlab-3.6.13.ebuild b/dev-python/reportlab/reportlab-3.6.13.ebuild
deleted file mode 100644
index 4cfe0a1b7127..000000000000
--- a/dev-python/reportlab/reportlab-3.6.13.ebuild
+++ /dev/null
@@ -1,63 +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_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/
-"
-SRC_URI+="
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.9-paths.patch
-	"${FILESDIR}"/${PN}-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch
-)
-
-distutils_enable_sphinx docs/source
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-		use-system-libart = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-4.0.4.ebuild b/dev-python/reportlab/reportlab-4.0.4.ebuild
index 9d41d2deab51..c4886666bf9a 100644
--- a/dev-python/reportlab/reportlab-4.0.4.ebuild
+++ b/dev-python/reportlab/reportlab-4.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]