commit: b3b0fd5793cd2be4107c57db406aa4c86f4e639e Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jan 26 13:33:07 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jan 26 13:33:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b0fd57
dev-python/pillow: Remove old Closes: https://github.com/gentoo/gentoo/pull/14447 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-python/pillow/Manifest | 2 - .../pillow/files/pillow-3.4.2-no-scripts.patch | 12 --- .../pillow/files/pillow-5.4.1-pkg-config.patch | 28 ------ .../files/pillow-5.4.1-toolchain-paths.patch | 12 --- dev-python/pillow/pillow-3.4.2-r1.ebuild | 102 -------------------- dev-python/pillow/pillow-5.4.1.ebuild | 106 --------------------- 6 files changed, 262 deletions(-) diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index 6fde61b6d7f..aa5451c56ce 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,5 +1,3 @@ -DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 -DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62 DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B bf3592bcc159902acc35899463c8949daf7cc31f03283684dc55d5f1517fdfbc07e1feb73b65b0b9cb4052ee1d5281558b38f9bd08240d0fc5727909b98da158 SHA512 ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31 DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73 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 deleted file mode 100644 index a8aa0ecc0d0..00000000000 --- a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/files/pillow-5.4.1-pkg-config.patch b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch deleted file mode 100644 index ec227b3f80a..00000000000 --- a/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index d3e95eef516..00000000000 --- a/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild deleted file mode 100644 index bddd6556d13..00000000000 --- a/dev-python/pillow/pillow-3.4.2-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_6 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 eutils virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.org/project/Pillow/"; -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib" -RESTRICT="!test? ( test )" - -REQUIRED_USE="test? ( jpeg tiff )" - -RDEPEND=" - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) - lcms? ( media-libs/lcms:2= ) - tiff? ( media-libs/tiff:0= ) - truetype? ( media-libs/freetype:2= ) - webp? ( media-libs/libwebp:0= ) - zlib? ( sys-libs/zlib:0= )" -DEPEND="${RDEPEND} - app-arch/unzip - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-better-theme[${PYTHON_USEDEP}] - >=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}] - <dev-python/sphinx_rtd_theme-0.2[${PYTHON_USEDEP}] - ) - test? ( dev-python/nose[${PYTHON_USEDEP}] ) - " - -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 - for f in jpeg lcms tiff tk webp zlib; do - if ! use ${f}; then - sed -i -e "s:feature.${f} =:& None #:" setup.py || die - fi - done - if ! use truetype; then - sed -i -e 's:feature.freetype =:& None #:' setup.py || die - fi - if ! use jpeg2k; then - sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die - fi - - sed \ - -e "/required/s:=.*:= set():g" \ - -e "/if f in/s:'jpeg', 'libz'::g" \ - -i setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - virtx nosetests -vx Tests/test_*.py -} - -python_install() { - python_doheader libImaging/{Imaging.h,ImPlatform.h} - - distutils-r1_python_install -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples ; then - docinto examples - dodoc Scripts/* - docompress -x /usr/share/doc/${PF}/examples - fi - - distutils-r1_python_install_all -} diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild deleted file mode 100644 index 2a2cb5034bb..00000000000 --- a/dev-python/pillow/pillow-5.4.1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7} ) -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/"; -SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" -RESTRICT="!test? ( test )" - -REQUIRED_USE="test? ( jpeg tiff )" - -RDEPEND=" - dev-python/olefile[${PYTHON_USEDEP}] - imagequant? ( media-gfx/libimagequant:0 ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) - lcms? ( media-libs/lcms:2= ) - tiff? ( media-libs/tiff:0=[jpeg,zlib] ) - truetype? ( media-libs/freetype:2= ) - webp? ( media-libs/libwebp:0= ) - zlib? ( sys-libs/zlib:0= )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - media-gfx/imagemagick[png] - ) -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.4.1-{pkg-config,toolchain-paths}.patch -) - -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. - mydistutilsargs=( - build_ext - --disable-platform-guessing - $(use_enable truetype freetype) - $(use_enable jpeg) - $(use_enable jpeg2k jpeg2000) - $(use_enable lcms) - $(use_enable tiff) - $(use_enable imagequant) - $(use_enable webp) - $(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() { - use doc && emake -C docs html -} - -python_test() { - "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed - virtx pytest -vv -p no:relaxed -} - -python_install() { - python_doheader src/libImaging/*.h - distutils-r1_python_install -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples ; then - docinto example - dodoc docs/example/* - docompress -x /usr/share/doc/${PF}/example - fi - distutils-r1_python_install_all -}
