* [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/
@ 2016-11-27 21:37 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2016-11-27 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 691a6ebb37a65aed9312539fc703884149660cfc
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 21:36:34 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 21:37:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691a6ebb
dev-python/pillow: don't install example scripts in /usr/bin
We already install them in /usr/share/doc/${PF}/examples.
This resolves a file collision with dev-python/cgkit.
Bug: https://bugs.gentoo.org/600694
Package-Manager: portage-2.3.2_p11
dev-python/pillow/files/pillow-3.4.2-no-scripts.patch | 12 ++++++++++++
.../pillow/{pillow-3.4.2.ebuild => pillow-3.4.2-r1.ebuild} | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
new file mode 100644
index 00000000..a8aa0ec
--- /dev/null
+++ b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 5257e748..410ce788 100644
+--- a/setup.py
++++ b/setup.py
+@@ -746,7 +746,6 @@ setup(name=NAME,
+ ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+ include_package_data=True,
+ packages=find_packages(),
+- scripts=glob.glob("Scripts/*.py"),
+ test_suite='nose.collector',
+ keywords=["Imaging", ],
+ license='Standard PIL License',
diff --git a/dev-python/pillow/pillow-3.4.2.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
similarity index 97%
rename from dev-python/pillow/pillow-3.4.2.ebuild
rename to dev-python/pillow/pillow-3.4.2-r1.ebuild
index 80079f9..c4ed8bc 100644
--- a/dev-python/pillow/pillow-3.4.2.ebuild
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -48,6 +48,10 @@ S="${WORKDIR}/${MY_P}"
# See _render and _clean in Tests/test_imagefont.py
DISTUTILS_IN_SOURCE_BUILD=1
+PATCHES=(
+ "${FILESDIR}/pillow-3.4.2-no-scripts.patch"
+)
+
python_prepare_all() {
# Disable all the stuff we don't want.
local f
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/
@ 2018-06-28 3:01 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2018-06-28 3:01 UTC (permalink / raw
To: gentoo-commits
commit: e1964254b29fd98ed9ffb9a2631487f4469f9d50
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 03:01:00 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 03:01:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1964254
dev-python/pillow: restore patch to remove scripts install
Closes: https://bugs.gentoo.org/562682
Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247
dev-python/pillow/files/pillow-4.3.0-no-scripts.patch | 12 ++++++++++++
.../pillow/{pillow-4.3.0.ebuild => pillow-4.3.0-r1.ebuild} | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
new file mode 100644
index 00000000000..c30b00d54d7
--- /dev/null
+++ b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/562682
+
+--- a/setup.py
++++ b/setup.py
+@@ -779,7 +779,6 @@ try:
+ ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+ include_package_data=True,
+ packages=find_packages(),
+- scripts=glob.glob("Scripts/*.py"),
+ install_requires=['olefile'],
+ test_suite='nose.collector',
+ keywords=["Imaging", ],
diff --git a/dev-python/pillow/pillow-4.3.0.ebuild b/dev-python/pillow/pillow-4.3.0-r1.ebuild
similarity index 97%
rename from dev-python/pillow/pillow-4.3.0.ebuild
rename to dev-python/pillow/pillow-4.3.0-r1.ebuild
index e18c4f67f8e..122241c3657 100644
--- a/dev-python/pillow/pillow-4.3.0.ebuild
+++ b/dev-python/pillow/pillow-4.3.0-r1.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/pillow-4.3.0-no-scripts.patch
+)
+
python_compile() {
# raqm not in portage yet
local args=(
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/
@ 2018-06-29 2:56 Virgil Dupras
0 siblings, 0 replies; 6+ messages in thread
From: Virgil Dupras @ 2018-06-29 2:56 UTC (permalink / raw
To: gentoo-commits
commit: 7dd0d64be1679025f5cc9c46da39b5b3ed2f8298
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 29 02:54:27 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 02:54:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd0d64b
dev-python/pillow: make all tests pass on 4.3.0
Closes: https://bugs.gentoo.org/593816
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch | 12 ++++++++++++
dev-python/pillow/pillow-4.3.0-r1.ebuild | 12 +++---------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
new file mode 100644
index 00000000000..211ef7ac58d
--- /dev/null
+++ b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
@@ -0,0 +1,12 @@
+--- a/Tests/test_imagefont.py
++++ b/Tests/test_imagefont.py
+@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase):
+ ('2', '8'): {'multiline': 6.2,
+ 'textsize': 2.5,
+ 'getters': (12, 16)},
++ ('2', '9'): {'multiline': 6.2,
++ 'textsize': 2.5,
++ 'getters': (12, 16)},
+ 'Default': {'multiline': 0.5,
+ 'textsize': 0.5,
+ 'getters': (12, 16)},
diff --git a/dev-python/pillow/pillow-4.3.0-r1.ebuild b/dev-python/pillow/pillow-4.3.0-r1.ebuild
index 28006e3c411..9b35828ba01 100644
--- a/dev-python/pillow/pillow-4.3.0-r1.ebuild
+++ b/dev-python/pillow/pillow-4.3.0-r1.ebuild
@@ -45,6 +45,8 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/pillow-4.3.0-no-scripts.patch
+ # can be removed at v5, patch already uptream. See bug 593816.
+ "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
)
python_compile() {
@@ -71,15 +73,7 @@ python_compile_all() {
python_test() {
"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
- # These excluded tests below depend heavily on freetype being at the exact
- # same as the one pinned upstream. However, pillow supports a wider range
- # of freetype versions. These tests are more useful to upstream developer
- # than to us. Disabling. See bug 593816.
- virtx nosetests -vx \
- -e "test_multiline_spacing" \
- -e "test_render_multiline(_text)?" \
- -e "test_textsize_equal" \
- Tests/test_*.py
+ virtx nosetests -vx Tests/test_*.py
}
python_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/
@ 2019-01-10 21:21 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2019-01-10 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 05ca39b5dc693c4e105e9afbcf556428c6e8ef3d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 23:00:42 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 21:19:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ca39b5
dev-python/pillow: Fix cross-compiling of 5.4.1
Normally you shouldn't add -I/usr/include or -L/usr/lib, even if it is
prepended with the SYSROOT, but Pillow's stupid build system checks
for headers with Python rather than the toolchain. Luckily only
minimal patching is needed.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../pillow/files/pillow-5.4.1-pkg-config.patch | 28 ++++++++++++++++++++++
.../files/pillow-5.4.1-toolchain-paths.patch | 12 ++++++++++
dev-python/pillow/pillow-5.4.1.ebuild | 15 ++++++++++--
3 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch
new file mode 100644
index 00000000000..ec227b3f80a
--- /dev/null
+++ b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch
@@ -0,0 +1,28 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py 2019-01-06 12:12:16.000000000 +0000
++++ b/setup.py 2019-01-08 23:04:45.574698210 +0000
+@@ -197,12 +197,13 @@
+
+ def _pkg_config(name):
+ try:
++ command = os.environ.get('PKG_CONFIG', 'pkg-config')
+ command_libs = [
+- 'pkg-config',
++ command,
+ '--libs-only-L', name,
+ ]
+ command_cflags = [
+- 'pkg-config',
++ command,
+ '--cflags-only-I', name,
+ ]
+ if not DEBUG:
+@@ -298,7 +299,7 @@
+ _add_directory(include_dirs, "src/libImaging")
+
+ pkg_config = None
+- if _cmd_exists('pkg-config'):
++ if _cmd_exists(os.environ.get('PKG_CONFIG', 'pkg-config')):
+ pkg_config = _pkg_config
+
+ #
diff --git a/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch b/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch
new file mode 100644
index 00000000000..d3e95eef516
--- /dev/null
+++ b/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch
@@ -0,0 +1,12 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py 2019-01-08 23:06:33.082873069 +0000
++++ b/setup.py 2019-01-08 23:06:47.707165225 +0000
+@@ -356,7 +356,7 @@
+ for d in os.environ[k].split(os.path.pathsep):
+ _add_directory(library_dirs, d)
+
+- prefix = sysconfig.get_config_var("prefix")
++ prefix = None
+ if prefix:
+ _add_directory(library_dirs, os.path.join(prefix, "lib"))
+ _add_directory(include_dirs, os.path.join(prefix, "include"))
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
index 61d35cce7f6..75df944128f 100644
--- a/dev-python/pillow/pillow-5.4.1.ebuild
+++ b/dev-python/pillow/pillow-5.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
PYTHON_REQ_USE='tk?,threads(+)'
-inherit distutils-r1 virtualx
+inherit distutils-r1 toolchain-funcs virtualx
MY_PN=Pillow
MY_P=${MY_PN}-${PV}
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
PATCHES=(
- "${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch"
+ "${FILESDIR}"/${PN}-5.4.1-{pkg-config,toolchain-paths}.patch
)
python_configure_all() {
@@ -66,6 +66,17 @@ python_configure_all() {
$(use_enable webp webpmux)
$(use_enable zlib)
)
+
+ # setup.py sucks at adding the right toolchain paths but it does
+ # accept additional ones from INCLUDE and LIB so set these. You
+ # wouldn't normally need these at all as the toolchain should look
+ # here anyway but this setup.py does stupid things.
+ export \
+ INCLUDE=${ESYSROOT}/usr/include \
+ LIB=${ESYSROOT}/usr/$(get_libdir)
+
+ # We have patched in this env var.
+ tc-export PKG_CONFIG
}
python_compile_all() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/
@ 2024-02-24 11:12 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2024-02-24 11:12 UTC (permalink / raw
To: gentoo-commits
commit: 8e99b60c8ac87e5498195015f0d19b1b4cbb96ab
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 11:10:05 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 11:12:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e99b60c
dev-python/pillow: Fix cross-compiling (again)
Upstream isn't merging my patch in a hurry so apply here.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
dev-python/pillow/files/pillow-10.2.0-cross.patch | 62 ++++++++++
dev-python/pillow/pillow-10.2.0-r1.ebuild | 131 ++++++++++++++++++++++
2 files changed, 193 insertions(+)
diff --git a/dev-python/pillow/files/pillow-10.2.0-cross.patch b/dev-python/pillow/files/pillow-10.2.0-cross.patch
new file mode 100644
index 000000000000..864a9b1218d1
--- /dev/null
+++ b/dev-python/pillow/files/pillow-10.2.0-cross.patch
@@ -0,0 +1,62 @@
+From 774d7a570d9f76903de3c3267512b8a7d252c21e Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 22 Dec 2023 22:38:27 +0000
+Subject: [PATCH] Fix cross-compiling by searching the right lib and include
+ directories
+
+We were previously searching the `{sys.prefix}/lib` and
+`{sys.prefix}/include` directories unconditionally. This is problematic
+when cross-compiling, as it does not take account of any sysroot where
+alternative libraries and headers are located. Adding `-I/usr/include`
+causes the build to explode, at least when cross-compiling from 64-bit
+to 32-bit.
+
+Python does not officially support cross-compiling, but Gentoo achieves
+this by modifying the sysconfig variables like `LIBDIR` and `INCLUDEDIR`
+with great results.
+
+Assuming "lib" is bad. 64-bit Linux systems often use lib64, putting
+32-bit libraries under lib. You cannot assume that either though, as
+pure 64-bit Linux systems may just use lib instead. Things get even
+stranger on RISC-V.
+
+The value of `sys.prefix` changes when using a virtualenv. Dependencies
+may be installed here, so it does make sense to continue supporting this
+case, even if it is incompatible with cross-compiling. Unlike regular
+environments, "lib" is generally used for libraries, although a lib64
+symlink may also be present.
+---
+ setup.py | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 1bf0bcff558..07163d001fc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -15,6 +15,7 @@
+ import struct
+ import subprocess
+ import sys
++import sysconfig
+ import warnings
+
+ from setuptools import Extension, setup
+@@ -504,8 +505,16 @@ def build_extensions(self):
+ for d in os.environ[k].split(os.path.pathsep):
+ _add_directory(library_dirs, d)
+
+- _add_directory(library_dirs, os.path.join(sys.prefix, "lib"))
+- _add_directory(include_dirs, os.path.join(sys.prefix, "include"))
++ _add_directory(
++ library_dirs,
++ (sys.prefix == sys.base_prefix and sysconfig.get_config_var("LIBDIR"))
++ or os.path.join(sys.prefix, "lib"),
++ )
++ _add_directory(
++ include_dirs,
++ (sys.prefix == sys.base_prefix and sysconfig.get_config_var("INCLUDEDIR"))
++ or os.path.join(sys.prefix, "include"),
++ )
+
+ #
+ # add platform directories
diff --git a/dev-python/pillow/pillow-10.2.0-r1.ebuild b/dev-python/pillow/pillow-10.2.0-r1.ebuild
new file mode 100644
index 000000000000..7baed0acf5a1
--- /dev/null
+++ b/dev-python/pillow/pillow-10.2.0-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+# setuptools wrapper
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="
+ https://python-pillow.org/
+ https://github.com/python-pillow/Pillow/
+ https://pypi.org/project/pillow/
+"
+SRC_URI="
+ https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ imagequant? ( media-gfx/libimagequant:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ lcms? ( media-libs/lcms:2= )
+ tiff? ( media-libs/tiff:=[jpeg,zlib] )
+ truetype? ( media-libs/freetype:2= )
+ webp? ( media-libs/libwebp:= )
+ xcb? ( x11-libs/libxcb )
+ zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+ ${DEPEND}
+ dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ virtual/pkgconfig
+ test? (
+ ${RDEPEND}
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ || (
+ media-gfx/imagemagick[png]
+ media-gfx/graphicsmagick[png]
+ )
+ )
+"
+
+EPYTEST_DESELECT=(
+ # TODO; incompatible Qt version?
+ Tests/test_qt_image_qapplication.py::test_sanity
+)
+
+PATCHES=(
+ # https://github.com/python-pillow/pillow/pull/7634
+ "${FILESDIR}/${P}-cross.patch"
+)
+
+usepil() {
+ usex "${1}" enable disable
+}
+
+python_configure_all() {
+ # It's important that these flags are also passed during the install phase
+ # as well. Make sure of that if you change the lines below. See bug 661308.
+ cat >> setup.cfg <<-EOF || die
+ [build_ext]
+ disable_platform_guessing = True
+ $(usepil truetype)_freetype = True
+ $(usepil jpeg)_jpeg = True
+ $(usepil jpeg2k)_jpeg2000 = True
+ $(usepil lcms)_lcms = True
+ $(usepil tiff)_tiff = True
+ $(usepil imagequant)_imagequant = True
+ $(usepil webp)_webp = True
+ $(usepil webp)_webpmux = True
+ $(usepil xcb)_xcb = True
+ $(usepil zlib)_zlib = True
+ EOF
+
+ # We have patched in this env var.
+ tc-export PKG_CONFIG
+}
+
+src_test() {
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO (is clipboard unreliable in Xvfb?)
+ Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
+ )
+
+ "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+ # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+ epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ python_doheader src/libImaging/*.h
+ distutils-r1_python_install
+}
+
+python_install_all() {
+ if use examples ; then
+ docinto example
+ dodoc docs/example/*
+ docompress -x /usr/share/doc/${PF}/example
+ fi
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/
@ 2025-01-26 3:06 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2025-01-26 3:06 UTC (permalink / raw
To: gentoo-commits
commit: 57aa973c8f342594619c02d915ffe76f917dbe33
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 16:03:36 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 03:05:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57aa973c
dev-python/pillow: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pillow/Manifest | 4 -
dev-python/pillow/files/pillow-10.3.0-py313.patch | 23 ----
.../files/pillow-11.0.0-automagic-disable.patch | 26 ----
.../pillow/files/pillow-11.0.0-wrong-arg.patch | 32 -----
dev-python/pillow/pillow-10.2.0-r1.ebuild | 131 ------------------
dev-python/pillow/pillow-10.3.0.ebuild | 139 -------------------
dev-python/pillow/pillow-10.4.0.ebuild | 137 -------------------
dev-python/pillow/pillow-11.0.0-r1.ebuild | 149 --------------------
dev-python/pillow/pillow-11.0.0-r2.ebuild | 151 ---------------------
dev-python/pillow/pillow-11.0.0.ebuild | 136 -------------------
10 files changed, 928 deletions(-)
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index f4a38677adf2..4f95ca51fa5b 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1 @@
-DIST pillow-10.2.0.gh.tar.gz 46244216 BLAKE2B 27bb076f0adade34295e6dfec5c5a1499471036e4f5358f0b3985c064a0ae962be9e91985851b369a49162ef520a84bb20eb1a5acb074fe94d861f042e4ada92 SHA512 d77ebedfb89d541db2fcba4fc354e097b9917594170bad07c67e22de123c9e0bbc9c55a938fc152bbdcca3ce23de6fa374a6d3d3bdbd44f16dbc2616c1bddf60
-DIST pillow-10.3.0.gh.tar.gz 46636534 BLAKE2B 523486a3adc8905dbe0691e7092654e7884c34703f351e228a49b1cb6e9cffdf504b842aa0c83b18afb8f0dbe1265274044003aba540d6427ec3cd46ddda1498 SHA512 11095f435ba30ac364575271de4c94d498b6fc1d67730b8212fae6f187902129018ca950aa878843f4d1b29e25aab1be245ed313fd3bc110ccf9ce3ae266d840
-DIST pillow-10.4.0.gh.tar.gz 46617167 BLAKE2B 3eb7852ab087d18e5b9a03d6cbf83ead96b637a71d4209a4574d66c9d098936d240c0be3235d9e951ec094b9b0def196b265a8e68f59802f843171c74ca7bbac SHA512 835a8766c384ec3fcf67b42c9bbad35dad0848cc5bd9eba1b0768a864e174a1d9c4a5e989f22496a40f2c29dd7f492f6f80465903fe872b10749cfa0340e1bc5
-DIST pillow-11.0.0.gh.tar.gz 46807844 BLAKE2B c91b92152d2f763fd20a74e2bddf413a669430074b8c5304b623ff63df177346ec4031e928fbc9765e1e0ca5f21cc101d5b7688a09dea19c5828f0cea02fe018 SHA512 0a74d7b12311acb3c9b39af87dc4e1e2ecae22134300a2a8c979daa3947a20f78bf77a93cd7f0029e98936a07e8d5e4fae826322fe0ccc1d1a8200350f9cbb7b
DIST pillow-11.1.0.gh.tar.gz 46815201 BLAKE2B 7990683c90359e0a72e17a13e1a29455bc3ace8ce3616d6af59360edfc1ac87541bd1fd6967160bd8d7dd25cfedfc9d2e9b058c3ed433a6208379834f15bc312 SHA512 bb0622fae0b9c3903ddd945dced8e2b94348b2bd06c14bc74da00d8aa3a795aab2daaff39ca6c40b712dcce4f10218cd30739f0eb616c9dfbc16efcf80886f1e
diff --git a/dev-python/pillow/files/pillow-10.3.0-py313.patch b/dev-python/pillow/files/pillow-10.3.0-py313.patch
deleted file mode 100644
index 1574d6be3cef..000000000000
--- a/dev-python/pillow/files/pillow-10.3.0-py313.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 57399ce204d79c74c80612c622bb788e20d786e8 Mon Sep 17 00:00:00 2001
-From: Andrew Murray <radarhere@users.noreply.github.com>
-Date: Fri, 10 May 2024 22:43:56 +1000
-Subject: [PATCH] Parse _version contents instead of using exec()
-
----
- setup.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 7d8e1c1ee21..abdd87ea252 100644
---- a/setup.py
-+++ b/setup.py
-@@ -23,8 +23,7 @@
- def get_version():
- version_file = "src/PIL/_version.py"
- with open(version_file, encoding="utf-8") as f:
-- exec(compile(f.read(), version_file, "exec"))
-- return locals()["__version__"]
-+ return f.read().split('"')[1]
-
-
- configuration = {}
diff --git a/dev-python/pillow/files/pillow-11.0.0-automagic-disable.patch b/dev-python/pillow/files/pillow-11.0.0-automagic-disable.patch
deleted file mode 100644
index 81bd47dc4a8b..000000000000
--- a/dev-python/pillow/files/pillow-11.0.0-automagic-disable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/947136
-https://github.com/python-pillow/Pillow/issues/8468
-https://github.com/python-pillow/Pillow/pull/8469
-
-From 7c194b54ef3e7a04c5b669353622687075b5ebb4 Mon Sep 17 00:00:00 2001
-From: Andrew Murray <radarhere@users.noreply.github.com>
-Date: Wed, 16 Oct 2024 21:37:14 +1100
-Subject: [PATCH] Fixed disabling a feature
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 60707083f6e..def3417845d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -389,7 +389,7 @@ def finalize_options(self) -> None:
- pass
- for x in self.feature:
- if getattr(self, f"disable_{x}"):
-- setattr(self.feature, x, False)
-+ self.feature.set(x, False)
- self.feature.required.discard(x)
- _dbg("Disabling %s", x)
- if getattr(self, f"enable_{x}"):
diff --git a/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch b/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch
deleted file mode 100644
index 3337b8c4be23..000000000000
--- a/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 180c1d1ef0c0ef12e0c56adfe10c7779dff3b55f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 3 Nov 2024 16:35:54 +0100
-Subject: [PATCH] Revert "Corrected passing TIFF_LONG to libtiff"
-
-This is the wrong solution to the problem at hand, and results
-in passing an int64_t where libtiff expects uint32_t. This seems
-to miraculously work on most of our platforms but it is clearly wrong,
-and it breaks ppc32.
-
-Bug: https://github.com/python-pillow/Pillow/issues/8522
-Reverts: b1b0353d17bcdca99cfcb2ea48c6af7861fb43ba
----
- src/encode.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/encode.c b/src/encode.c
-index 1a4cd489d..ba350c39a 100644
---- a/src/encode.c
-+++ b/src/encode.c
-@@ -929,7 +929,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) {
- );
- } else if (type == TIFF_LONG) {
- status = ImagingLibTiffSetField(
-- &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value)
-+ &encoder->state, (ttag_t)key_int, (UINT32)PyLong_AsLong(value)
- );
- } else if (type == TIFF_SSHORT) {
- status = ImagingLibTiffSetField(
---
-2.47.0
-
diff --git a/dev-python/pillow/pillow-10.2.0-r1.ebuild b/dev-python/pillow/pillow-10.2.0-r1.ebuild
deleted file mode 100644
index c9d3ec32f1c5..000000000000
--- a/dev-python/pillow/pillow-10.2.0-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
- https://python-pillow.org/
- https://github.com/python-pillow/Pillow/
- https://pypi.org/project/pillow/
-"
-SRC_URI="
- https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- imagequant? ( media-gfx/libimagequant:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- tiff? ( media-libs/tiff:=[jpeg,zlib] )
- truetype? ( media-libs/freetype:2= )
- webp? ( media-libs/libwebp:= )
- xcb? ( x11-libs/libxcb )
- zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
- ${DEPEND}
- dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/pkgconfig
- test? (
- ${RDEPEND}
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- || (
- media-gfx/imagemagick[png]
- media-gfx/graphicsmagick[png]
- )
- )
-"
-
-EPYTEST_DESELECT=(
- # TODO; incompatible Qt version?
- Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-PATCHES=(
- # https://github.com/python-pillow/pillow/pull/7634
- "${FILESDIR}/${P}-cross.patch"
-)
-
-usepil() {
- usex "${1}" enable disable
-}
-
-python_configure_all() {
- # It's important that these flags are also passed during the install phase
- # as well. Make sure of that if you change the lines below. See bug 661308.
- cat >> setup.cfg <<-EOF || die
- [build_ext]
- disable_platform_guessing = True
- $(usepil truetype)_freetype = True
- $(usepil jpeg)_jpeg = True
- $(usepil jpeg2k)_jpeg2000 = True
- $(usepil lcms)_lcms = True
- $(usepil tiff)_tiff = True
- $(usepil imagequant)_imagequant = True
- $(usepil webp)_webp = True
- $(usepil webp)_webpmux = True
- $(usepil xcb)_xcb = True
- $(usepil zlib)_zlib = True
- EOF
-
- # We have patched in this env var.
- tc-export PKG_CONFIG
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO (is clipboard unreliable in Xvfb?)
- Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
- )
-
- "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
- # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
- epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
- python_doheader src/libImaging/*.h
- distutils-r1_python_install
-}
-
-python_install_all() {
- if use examples ; then
- docinto example
- dodoc docs/example/*
- docompress -x /usr/share/doc/${PF}/example
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-10.3.0.ebuild b/dev-python/pillow/pillow-10.3.0.ebuild
deleted file mode 100644
index 81b77d909bc5..000000000000
--- a/dev-python/pillow/pillow-10.3.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
- https://python-pillow.org/
- https://github.com/python-pillow/Pillow/
- https://pypi.org/project/pillow/
-"
-SRC_URI="
- https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- imagequant? ( media-gfx/libimagequant:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- tiff? ( media-libs/tiff:=[jpeg,zlib] )
- truetype? ( media-libs/freetype:2= )
- webp? ( media-libs/libwebp:= )
- xcb? ( x11-libs/libxcb )
- zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
- ${DEPEND}
- dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/pkgconfig
- test? (
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- || (
- media-gfx/imagemagick[png]
- media-gfx/graphicsmagick[png]
- )
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/python-pillow/pillow/pull/7634
- "${FILESDIR}/${PN}-10.2.0-cross.patch"
- # https://github.com/python-pillow/Pillow/pull/8050
- "${FILESDIR}/${P}-py313.patch"
-)
-
-usepil() {
- usex "${1}" enable disable
-}
-
-python_configure_all() {
- cat >> setup.cfg <<-EOF || die
- [build_ext]
- debug = True
- disable_platform_guessing = True
- $(usepil truetype)_freetype = True
- $(usepil jpeg)_jpeg = True
- $(usepil jpeg2k)_jpeg2000 = True
- $(usepil lcms)_lcms = True
- $(usepil tiff)_tiff = True
- $(usepil imagequant)_imagequant = True
- $(usepil webp)_webp = True
- $(usepil webp)_webpmux = True
- $(usepil xcb)_xcb = True
- $(usepil zlib)_zlib = True
- EOF
- if use truetype; then
- # these dependencies are implicitly disabled by USE=-truetype
- # and we can't pass both disable_* and vendor_*
- # https://bugs.gentoo.org/935124
- cat >> setup.cfg <<-EOF || die
- vendor_raqm = False
- vendor_fribidi = False
- EOF
- fi
-
- tc-export PKG_CONFIG
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO (is clipboard unreliable in Xvfb?)
- Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
- # requires xz-utils[extra-filters]?
- Tests/test_file_libtiff.py::TestFileLibTiff::test_lzma
- )
-
- "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- # leak tests are fragile and broken under xdist
- epytest -k "not leak" -p timeout || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
- python_doheader src/libImaging/*.h
- distutils-r1_python_install
-}
-
-python_install_all() {
- if use examples ; then
- docinto example
- dodoc docs/example/*
- docompress -x /usr/share/doc/${PF}/example
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-10.4.0.ebuild b/dev-python/pillow/pillow-10.4.0.ebuild
deleted file mode 100644
index 4b882d2ca2df..000000000000
--- a/dev-python/pillow/pillow-10.4.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
- https://python-pillow.org/
- https://github.com/python-pillow/Pillow/
- https://pypi.org/project/pillow/
-"
-SRC_URI="
- https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- imagequant? ( media-gfx/libimagequant:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- tiff? ( media-libs/tiff:=[jpeg,zlib] )
- truetype? ( media-libs/freetype:2= )
- webp? ( media-libs/libwebp:= )
- xcb? ( x11-libs/libxcb )
- zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
- ${DEPEND}
- dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/pkgconfig
- test? (
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- || (
- media-gfx/imagemagick[png]
- media-gfx/graphicsmagick[png]
- )
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/python-pillow/pillow/pull/7634
- "${FILESDIR}/${PN}-10.2.0-cross.patch"
-)
-
-usepil() {
- usex "${1}" enable disable
-}
-
-python_configure_all() {
- cat >> setup.cfg <<-EOF || die
- [build_ext]
- debug = True
- disable_platform_guessing = True
- $(usepil truetype)_freetype = True
- $(usepil jpeg)_jpeg = True
- $(usepil jpeg2k)_jpeg2000 = True
- $(usepil lcms)_lcms = True
- $(usepil tiff)_tiff = True
- $(usepil imagequant)_imagequant = True
- $(usepil webp)_webp = True
- $(usepil webp)_webpmux = True
- $(usepil xcb)_xcb = True
- $(usepil zlib)_zlib = True
- EOF
- if use truetype; then
- # these dependencies are implicitly disabled by USE=-truetype
- # and we can't pass both disable_* and vendor_*
- # https://bugs.gentoo.org/935124
- cat >> setup.cfg <<-EOF || die
- vendor_raqm = False
- vendor_fribidi = False
- EOF
- fi
-
- tc-export PKG_CONFIG
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO (is clipboard unreliable in Xvfb?)
- Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
- # requires xz-utils[extra-filters]?
- Tests/test_file_libtiff.py::TestFileLibTiff::test_lzma
- )
-
- "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- # leak tests are fragile and broken under xdist
- epytest -k "not leak" -p timeout || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
- python_doheader src/libImaging/*.h
- distutils-r1_python_install
-}
-
-python_install_all() {
- if use examples ; then
- docinto example
- dodoc docs/example/*
- docompress -x /usr/share/doc/${PF}/example
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-11.0.0-r1.ebuild b/dev-python/pillow/pillow-11.0.0-r1.ebuild
deleted file mode 100644
index 3ffd135f83db..000000000000
--- a/dev-python/pillow/pillow-11.0.0-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
- https://python-pillow.org/
- https://github.com/python-pillow/Pillow/
- https://pypi.org/project/pillow/
-"
-SRC_URI="
- https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- imagequant? ( media-gfx/libimagequant:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- tiff? ( media-libs/tiff:=[jpeg,zlib] )
- truetype? ( media-libs/freetype:2= )
- webp? ( media-libs/libwebp:= )
- xcb? ( x11-libs/libxcb )
- zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
- ${DEPEND}
- dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/pkgconfig
- test? (
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- || (
- media-gfx/imagemagick[png]
- media-gfx/graphicsmagick[png]
- )
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/python-pillow/pillow/pull/7634
- "${FILESDIR}/${PN}-10.2.0-cross.patch"
- # https://github.com/python-pillow/Pillow/issues/8522
- "${FILESDIR}/${P}-wrong-arg.patch"
-)
-
-usepil() {
- usex "${1}" enable disable
-}
-
-python_configure_all() {
- cat >> setup.cfg <<-EOF || die
- [build_ext]
- debug = True
- disable_platform_guessing = True
- $(usepil truetype)_freetype = True
- $(usepil jpeg)_jpeg = True
- $(usepil jpeg2k)_jpeg2000 = True
- $(usepil lcms)_lcms = True
- $(usepil tiff)_tiff = True
- $(usepil imagequant)_imagequant = True
- $(usepil webp)_webp = True
- $(usepil xcb)_xcb = True
- $(usepil zlib)_zlib = True
- EOF
- if use truetype; then
- # these dependencies are implicitly disabled by USE=-truetype
- # and we can't pass both disable_* and vendor_*
- # https://bugs.gentoo.org/935124
- cat >> setup.cfg <<-EOF || die
- vendor_raqm = False
- vendor_fribidi = False
- EOF
- fi
-
- tc-export PKG_CONFIG
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO (is clipboard unreliable in Xvfb?)
- Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
- # requires xz-utils[extra-filters]?
- Tests/test_file_libtiff.py::TestFileLibTiff::test_lzma
- )
-
- case ${ARCH} in
- ppc)
- EPYTEST_DESELECT+=(
- # https://github.com/python-pillow/Pillow/issues/7008
- # (we've reverted the upstream patch because it was worse
- # than the original issue)
- Tests/test_file_libtiff.py::TestFileLibTiff::test_exif_ifd
- )
- ;;
- esac
-
- "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- # leak tests are fragile and broken under xdist
- epytest -k "not leak" -p timeout || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
- python_doheader src/libImaging/*.h
- distutils-r1_python_install
-}
-
-python_install_all() {
- if use examples ; then
- docinto example
- dodoc docs/example/*
- docompress -x /usr/share/doc/${PF}/example
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-11.0.0-r2.ebuild b/dev-python/pillow/pillow-11.0.0-r2.ebuild
deleted file mode 100644
index 95d2098b3325..000000000000
--- a/dev-python/pillow/pillow-11.0.0-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
- https://python-pillow.org/
- https://github.com/python-pillow/Pillow/
- https://pypi.org/project/pillow/
-"
-SRC_URI="
- https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- imagequant? ( media-gfx/libimagequant:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- tiff? ( media-libs/tiff:=[jpeg,zlib] )
- truetype? ( media-libs/freetype:2= )
- webp? ( media-libs/libwebp:= )
- xcb? ( x11-libs/libxcb )
- zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
- ${DEPEND}
- dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/pkgconfig
- test? (
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- || (
- media-gfx/imagemagick[png]
- media-gfx/graphicsmagick[png]
- )
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/python-pillow/pillow/pull/7634
- "${FILESDIR}/${PN}-10.2.0-cross.patch"
- # https://github.com/python-pillow/Pillow/issues/8522
- "${FILESDIR}/${P}-wrong-arg.patch"
- # https://github.com/python-pillow/Pillow/pull/8469
- "${FILESDIR}/${P}-automagic-disable.patch"
-)
-
-usepil() {
- usex "${1}" enable disable
-}
-
-python_configure_all() {
- cat >> setup.cfg <<-EOF || die
- [build_ext]
- debug = True
- disable_platform_guessing = True
- $(usepil truetype)_freetype = True
- $(usepil jpeg)_jpeg = True
- $(usepil jpeg2k)_jpeg2000 = True
- $(usepil lcms)_lcms = True
- $(usepil tiff)_tiff = True
- $(usepil imagequant)_imagequant = True
- $(usepil webp)_webp = True
- $(usepil xcb)_xcb = True
- $(usepil zlib)_zlib = True
- EOF
- if use truetype; then
- # these dependencies are implicitly disabled by USE=-truetype
- # and we can't pass both disable_* and vendor_*
- # https://bugs.gentoo.org/935124
- cat >> setup.cfg <<-EOF || die
- vendor_raqm = False
- vendor_fribidi = False
- EOF
- fi
-
- tc-export PKG_CONFIG
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO (is clipboard unreliable in Xvfb?)
- Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
- # requires xz-utils[extra-filters]?
- Tests/test_file_libtiff.py::TestFileLibTiff::test_lzma
- )
-
- case ${ARCH} in
- ppc)
- EPYTEST_DESELECT+=(
- # https://github.com/python-pillow/Pillow/issues/7008
- # (we've reverted the upstream patch because it was worse
- # than the original issue)
- Tests/test_file_libtiff.py::TestFileLibTiff::test_exif_ifd
- )
- ;;
- esac
-
- "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- # leak tests are fragile and broken under xdist
- epytest -k "not leak" -p timeout || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
- python_doheader src/libImaging/*.h
- distutils-r1_python_install
-}
-
-python_install_all() {
- if use examples ; then
- docinto example
- dodoc docs/example/*
- docompress -x /usr/share/doc/${PF}/example
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-11.0.0.ebuild b/dev-python/pillow/pillow-11.0.0.ebuild
deleted file mode 100644
index 1545baf35679..000000000000
--- a/dev-python/pillow/pillow-11.0.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-# setuptools wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
- https://python-pillow.org/
- https://github.com/python-pillow/Pillow/
- https://pypi.org/project/pillow/
-"
-SRC_URI="
- https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- imagequant? ( media-gfx/libimagequant:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- tiff? ( media-libs/tiff:=[jpeg,zlib] )
- truetype? ( media-libs/freetype:2= )
- webp? ( media-libs/libwebp:= )
- xcb? ( x11-libs/libxcb )
- zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
- ${DEPEND}
- dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- virtual/pkgconfig
- test? (
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pytest-timeout[${PYTHON_USEDEP}]
- || (
- media-gfx/imagemagick[png]
- media-gfx/graphicsmagick[png]
- )
- )
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/python-pillow/pillow/pull/7634
- "${FILESDIR}/${PN}-10.2.0-cross.patch"
-)
-
-usepil() {
- usex "${1}" enable disable
-}
-
-python_configure_all() {
- cat >> setup.cfg <<-EOF || die
- [build_ext]
- debug = True
- disable_platform_guessing = True
- $(usepil truetype)_freetype = True
- $(usepil jpeg)_jpeg = True
- $(usepil jpeg2k)_jpeg2000 = True
- $(usepil lcms)_lcms = True
- $(usepil tiff)_tiff = True
- $(usepil imagequant)_imagequant = True
- $(usepil webp)_webp = True
- $(usepil xcb)_xcb = True
- $(usepil zlib)_zlib = True
- EOF
- if use truetype; then
- # these dependencies are implicitly disabled by USE=-truetype
- # and we can't pass both disable_* and vendor_*
- # https://bugs.gentoo.org/935124
- cat >> setup.cfg <<-EOF || die
- vendor_raqm = False
- vendor_fribidi = False
- EOF
- fi
-
- tc-export PKG_CONFIG
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- local EPYTEST_DESELECT=(
- # TODO (is clipboard unreliable in Xvfb?)
- Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
- # requires xz-utils[extra-filters]?
- Tests/test_file_libtiff.py::TestFileLibTiff::test_lzma
- )
-
- "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- # leak tests are fragile and broken under xdist
- epytest -k "not leak" -p timeout || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
- python_doheader src/libImaging/*.h
- distutils-r1_python_install
-}
-
-python_install_all() {
- if use examples ; then
- docinto example
- dodoc docs/example/*
- docompress -x /usr/share/doc/${PF}/example
- fi
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-01-26 3:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-10 21:21 [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2025-01-26 3:06 Michał Górny
2024-02-24 11:12 James Le Cuirot
2018-06-29 2:56 Virgil Dupras
2018-06-28 3:01 Mike Gilbert
2016-11-27 21:37 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox