* [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/files/, dev-python/reportlab/
@ 2015-11-25 20:05 Mike Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert @ 2015-11-25 20:05 UTC (permalink / raw
To: gentoo-commits
commit: f5a58267ec4f7a941ecef85fdb8e7d402fbccf81
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 20:04:31 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 20:05:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a58267
dev-python/reportlab: Patch-out pip and setuptools from setup.py
Bug: https://bugs.gentoo.org/566750
Package-Manager: portage-2.2.26_p3
dev-python/reportlab/files/reportlab-no-pip.patch | 12 ++++++++++++
...reportlab-3.1.44-r1.ebuild => reportlab-3.1.44-r2.ebuild} | 4 ++++
.../{reportlab-3.2.0.ebuild => reportlab-3.2.0-r1.ebuild} | 4 ++++
3 files changed, 20 insertions(+)
diff --git a/dev-python/reportlab/files/reportlab-no-pip.patch b/dev-python/reportlab/files/reportlab-no-pip.patch
new file mode 100644
index 0000000..332878e
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-no-pip.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -538,7 +538,7 @@
+ ],
+
+ #this probably only works for setuptools, but distutils seems to ignore it
+- install_requires=['pillow>=2.4.0','pip>=1.4.1', 'setuptools>=2.2'],
++ install_requires=['pillow>=2.4.0'],
+ )
+ print()
+ print('########## SUMMARY INFO #########')
diff --git a/dev-python/reportlab/reportlab-3.1.44-r1.ebuild b/dev-python/reportlab/reportlab-3.1.44-r2.ebuild
similarity index 97%
rename from dev-python/reportlab/reportlab-3.1.44-r1.ebuild
rename to dev-python/reportlab/reportlab-3.1.44-r2.ebuild
index da7f69b..2f49105 100644
--- a/dev-python/reportlab/reportlab-3.1.44-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.1.44-r2.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
app-arch/unzip
"
+PATCHES=(
+ "${FILESDIR}"/reportlab-no-pip.patch
+)
+
src_unpack() {
unpack ${P}.tar.gz
cd ${P}/src/reportlab/fonts || die
diff --git a/dev-python/reportlab/reportlab-3.2.0.ebuild b/dev-python/reportlab/reportlab-3.2.0-r1.ebuild
similarity index 96%
rename from dev-python/reportlab/reportlab-3.2.0.ebuild
rename to dev-python/reportlab/reportlab-3.2.0-r1.ebuild
index fc3505f..01f702b 100644
--- a/dev-python/reportlab/reportlab-3.2.0.ebuild
+++ b/dev-python/reportlab/reportlab-3.2.0-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
app-arch/unzip
"
+PATCHES=(
+ "${FILESDIR}"/reportlab-no-pip.patch
+)
+
src_unpack() {
unpack ${P}.tar.gz
cd ${P}/src/reportlab/fonts || die
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/files/, dev-python/reportlab/
@ 2019-01-27 16:01 Virgil Dupras
0 siblings, 0 replies; 4+ messages in thread
From: Virgil Dupras @ 2019-01-27 16:01 UTC (permalink / raw
To: gentoo-commits
commit: 560a92f6f491c6b3369ce7d7ee4d6d7048ae4d7b
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 16:00:35 2019 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 16:01:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=560a92f6
dev-python/reportlab: bump to 3.5.13
I removed the sed and eprefixy because they had no effect.
I also disabled the two tests accessing internet through patching.
Closes: https://bugs.gentoo.org/616274
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-python/reportlab/Manifest | 1 +
.../reportlab-3.5.13-disable-network-tests.patch | 23 ++++++++
dev-python/reportlab/reportlab-3.5.13.ebuild | 65 ++++++++++++++++++++++
3 files changed, 89 insertions(+)
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index a450f04baba..9b9a81253b9 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,4 @@
DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
DIST reportlab-3.4.0.tar.gz 1995779 BLAKE2B e1111e784ead913f803ba8151bf3585fdba9fb5e0c1d568c839d5ac08f5e6757b608c8049644264dd1f0bee5b4bb0c1750640a70feef34eff8e276d9929377e9 SHA512 7f00074b93be49e1aa7650e61381e285598599911b12a6b63c0f12d6eb64bc59afb6907b683350740b0a81c99a3164373b27e18cfccc0f9da12405c3dacd1ff7
+DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch b/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
new file mode 100644
index 00000000000..e1a760d4d46
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
@@ -0,0 +1,23 @@
+diff -r f52d1198146d tests/test_lib_utils.py
+--- a/tests/test_lib_utils.py Tue Jan 15 16:06:40 2019 +0000
++++ b/tests/test_lib_utils.py Sun Jan 27 10:21:29 2019 -0500
+@@ -112,7 +112,7 @@
+ "test open and read of a relative file: URL"
+ b = _rel_open_and_read('file:../docs/images/Edit_Prefs.gif')
+
+- def test9(self):
++ def xtest9(self):
+ "test open and read of an http: URL"
+ from reportlab.lib.utils import open_and_read
+ b = open_and_read('http://www.reportlab.com/rsrc/encryption.gif')
+diff -r f52d1198146d tests/test_platypus_general.py
+--- a/tests/test_platypus_general.py Tue Jan 15 16:06:40 2019 +0000
++++ b/tests/test_platypus_general.py Sun Jan 27 10:21:29 2019 -0500
+@@ -587,7 +587,7 @@
+
+ class PlatypusTestCase(unittest.TestCase):
+
+- def test0(self):
++ def xtest0(self):
+ "Make a platypus document"
+ run()
diff --git a/dev-python/reportlab/reportlab-3.5.13.ebuild b/dev-python/reportlab/reportlab-3.5.13.ebuild
new file mode 100644
index 00000000000..31366f726b1
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.13.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) # Tests crash with pypy
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="http://www.reportlab.com/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+ http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+ dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+ media-libs/libart_lgpl
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ app-arch/unzip
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.5.13-disable-network-tests.patch"
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd ${P}/src/reportlab/fonts || die
+ unpack pfbfer-20070710.zip
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_compile() {
+ if ! python_is_python3; then
+ local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ fi
+ distutils-r1_python_compile
+}
+
+python_test() {
+ pushd tests > /dev/null || die
+ "${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ if use examples ; then
+ docinto examples
+ dosod -r demos/. tools/pythonpoint/demos
+ fi
+
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/files/, dev-python/reportlab/
@ 2019-04-21 12:19 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2019-04-21 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 757121ce5abed563609610918426879c3235f60a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 12:18:59 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 12:18:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=757121ce
dev-python/reportlab: Add patch for >=pillow-6
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/reportlab-3.5.13-pillow-VERSION.patch | 17 +++++++++++++++++
...portlab-3.5.13.ebuild => reportlab-3.5.13-r1.ebuild} | 1 +
2 files changed, 18 insertions(+)
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch b/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch
new file mode 100644
index 00000000000..3b2093d9a8c
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch
@@ -0,0 +1,17 @@
+--- a/src/reportlab/lib/utils.py
++++ b/src/reportlab/lib/utils.py
+@@ -883,7 +883,13 @@
+ im = self._image
+ mode = self.mode = im.mode
+ if mode in ('LA','RGBA'):
+- if Image.VERSION.startswith('1.1.7'): im.load()
++ # Pillow 6.0.0 and above have removed the 'VERSION' attribute
++ # https://bitbucket.org/rptlab/reportlab/issues/176/incompatibility-with-pillow-600
++ try:
++ im_ver = Image.__version__
++ except AttributeError:
++ im_ver = Image.VERSION
++ if im_ver.startswith('1.1.7'): im.load()
+ self._dataA = ImageReader(im.split()[3 if mode=='RGBA' else 1])
+ nm = mode[:-1]
+ im = im.convert(nm)
diff --git a/dev-python/reportlab/reportlab-3.5.13.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
similarity index 96%
rename from dev-python/reportlab/reportlab-3.5.13.ebuild
rename to dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index 26d754790dd..77800e21ecc 100644
--- a/dev-python/reportlab/reportlab-3.5.13.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-3.5.13-disable-network-tests.patch"
+ "${FILESDIR}/${PN}-3.5.13-pillow-VERSION.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/files/, dev-python/reportlab/
@ 2023-08-24 18:32 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-08-24 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 9c78cd6cb795a7d306ac94f4615f63b7fdb38fb9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 18:31:09 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 18:31:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c78cd6c
dev-python/reportlab: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/reportlab/Manifest | 1 -
...1-correct-srclen-type-in-gstate__aapixbuf.patch | 37 -------------
.../reportlab/files/reportlab-3.6.9-paths.patch | 21 --------
dev-python/reportlab/reportlab-3.6.13.ebuild | 63 ----------------------
4 files changed, 122 deletions(-)
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index dce410a5e94a..305693d24329 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,2 @@
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
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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-24 18:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-25 20:05 [gentoo-commits] repo/gentoo:master commit in: dev-python/reportlab/files/, dev-python/reportlab/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2019-01-27 16:01 Virgil Dupras
2019-04-21 12:19 David Seifert
2023-08-24 18:32 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox