From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- dev-python/pillow/Manifest | 4 +- dev-python/pillow/files/pillow-4.3.0-no-qt.patch | 30 +++++++ dev-python/pillow/pillow-4.3.0-r3.ebuild | 106 +++++++++++++++++++++++ dev-python/pillow/pillow-5.2.0.ebuild | 2 +- 4 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 dev-python/pillow/files/pillow-4.3.0-no-qt.patch create mode 100644 dev-python/pillow/pillow-4.3.0-r3.ebuild (limited to 'dev-python/pillow') diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index f59334fe4025..bab45a5107da 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,5 +1,6 @@ AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70 AUX pillow-4.3.0-freetype2.9-test-metrics.patch 553 BLAKE2B a5bfdf7789237b583c464f2cbb7cfdf645a272587337da227eeea98e41312bd2a7b3a7f22c182856577350489a849f52271a395f9799410a7a07f77654629197 SHA512 291ced301ee1938dfa19afc7b57285c57e6722e28f3adca492e390b1ac7a0cda43c58fa19b97cac81d2ed6ef928ccfb51de87e60b035e35f923c1a006e80be64 +AUX pillow-4.3.0-no-qt.patch 893 BLAKE2B c41d8ff63a3da5aadd0c7ebdd0c102e2a136c5feeb2bdab9b4a5a0167457b9bd51b617da94e236179bcd07762359c8692477db3af1f26aa8b373c5d19036cc7c SHA512 e67e670fc26ed438c3d00be91f0549e210692934bbaa3c6789b35178ea6c45412a69ddebebe9ea5f38bd748f7d20e4b6bd4f56277133bb470e44756168808582 AUX pillow-4.3.0-no-scripts.patch 392 BLAKE2B 1443119f49b0c76c75d17414851e7f54d673b804d8d268fea79fe9fcc4f6361d6d2e70cfc6d855c8c374bcc28b67672778f310f38442502bf5c7096e26bf0bc7 SHA512 500706b3736e17bbfdcf18d2e3038a96ab16a5ba1015fd2ee9332ae11d8f98594ac4c50dd0f7cfd5288703970d20d0a4f3174a8071442893903888d828a2d2da AUX pillow-5.2.0-no-usr-lib.patch 446 BLAKE2B 98a026f1fdf2e44fa20043aaa92ea1866b77abb244974f9c827dcafcab20c3f7f4a33a6582f3fea11416413576e4befeb0e79d57ff529dbf34937ae798ab3f59 SHA512 1bef741f5d1b12109dbe27afd360ee2d8c5d7c8a1d4a177e017bb9a789358bb0c7936e354f357cfa3817077eab21c831ebcbaf2730f63ef68541a380ca655598 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 @@ -7,5 +8,6 @@ DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9 EBUILD pillow-4.3.0-r2.ebuild 2335 BLAKE2B 927d5247c0146ab1a304bdd2985f2606e336b766ec6bcd5718508f0f51b583c27cd8256ce836e7f6100625b36c53ffe11c63cde624d682bff96c45eaa49fa5cd SHA512 4e387bf4d17babe9b33856391a7f66d0849e6d652685faeb8e6afb8770514502ebd5dd10dafd98855891ae1802583b0f8cc51b9a012cc9288146c281eac60d4f -EBUILD pillow-5.2.0.ebuild 2701 BLAKE2B 69e75f027ab441da6b8843322ceef55edb999da8b6dfc854998026aedb59b919ac661c3bfc6525b3673a534441b4fc9e830de2997df56df961adb234cd469a44 SHA512 f2e7ea59baa9383756acdccf9f4153b4f589356795945bb5b4895f285c20a4e8e0c8d5a57909d05e113f65780fe974d49f2e51dad793238cdcaaa849cc0dd205 +EBUILD pillow-4.3.0-r3.ebuild 2656 BLAKE2B a5134151a03fdcb4ae3f5e5c5daaa0ec251556ac18fe3b66dc1f8d8ab0be6bfcd571b28f12d98c5ac6740e83941912474b5b5795d9e44b889f9d4f2bca9385d8 SHA512 d32e85250fa166d4d03b437f3ac801d38466878626f6a743e6719295343c6271f067467a78891f8d16c95023851d8e17cf646a9cdd4dfa34bbd2eec54c681023 +EBUILD pillow-5.2.0.ebuild 2708 BLAKE2B 2865699afa48be13841cf08df7538a17ab7455d9b3a0bf1d9a6044917e638b9e973a4e2859cfa6bedd15b4cc8c169c3f556b431ccc7a3499303dcfee4f6ac2ee SHA512 a7e74e4a53aa88e7cc3191db0101a3323a102edc068e04ac931096be901e048a7a2eef7c7b9b96afbbeb7d839cf63330fa4ae6aa6197160d39f6b87f98b37820 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a diff --git a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch new file mode 100644 index 000000000000..231c605b8347 --- /dev/null +++ b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch @@ -0,0 +1,30 @@ +diff --git a/PIL/ImageQt.py b/PIL/ImageQt.py +index 36b4e1eb..ddde2cd9 100644 +--- a/PIL/ImageQt.py ++++ b/PIL/ImageQt.py +@@ -20,24 +20,7 @@ from . import Image + from ._util import isPath + from io import BytesIO + +-qt_is_installed = True +-qt_version = None +-try: +- from PyQt5.QtGui import QImage, qRgba, QPixmap +- from PyQt5.QtCore import QBuffer, QIODevice +- qt_version = '5' +-except (ImportError, RuntimeError): +- try: +- from PyQt4.QtGui import QImage, qRgba, QPixmap +- from PyQt4.QtCore import QBuffer, QIODevice +- qt_version = '4' +- except (ImportError, RuntimeError): +- try: +- from PySide.QtGui import QImage, qRgba, QPixmap +- from PySide.QtCore import QBuffer, QIODevice +- qt_version = 'side' +- except ImportError: +- qt_is_installed = False ++qt_is_installed = False + + + def rgb(r, g, b, a=255): diff --git a/dev-python/pillow/pillow-4.3.0-r3.ebuild b/dev-python/pillow/pillow-4.3.0-r3.ebuild new file mode 100644 index 000000000000..a799e79a1d3a --- /dev/null +++ b/dev-python/pillow/pillow-4.3.0-r3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,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://python-pillow.org/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp zlib" + +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= ) + qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) + 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/nose[${PYTHON_USEDEP}] + media-gfx/imagemagick[png] + ) +" + +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 +) + +src_prepare() { + if ! use qt5; then + # When we don't use qt5, we want to forcibly disable it by patching it + # out. Otherwise, we might encounter unexpected problems like in + # bug #662236 + eapply "${FILESDIR}/${PN}-4.3.0-no-qt.patch" + fi + eapply_user +} + +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) + ) +} + +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/*.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.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild index b4f435d0425c..76aa787e1a4d 100644 --- a/dev-python/pillow/pillow-5.2.0.ebuild +++ b/dev-python/pillow/pillow-5.2.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="HPND" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" REQUIRED_USE="test? ( jpeg tiff )" -- cgit v1.2.3