diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
commit | 957235cf19a691360c720f7913672adda4258ed0 (patch) | |
tree | 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /dev-python/pillow | |
parent | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff) |
gentoo resync : 07.10.2018
Diffstat (limited to 'dev-python/pillow')
-rw-r--r-- | dev-python/pillow/Manifest | 10 | ||||
-rw-r--r-- | dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch | 12 | ||||
-rw-r--r-- | dev-python/pillow/files/pillow-4.3.0-no-qt.patch | 30 | ||||
-rw-r--r-- | dev-python/pillow/files/pillow-4.3.0-no-scripts.patch | 12 | ||||
-rw-r--r-- | dev-python/pillow/pillow-4.3.0-r3.ebuild | 106 | ||||
-rw-r--r-- | dev-python/pillow/pillow-5.2.0.ebuild | 6 | ||||
-rw-r--r-- | dev-python/pillow/pillow-5.3.0.ebuild (renamed from dev-python/pillow/pillow-4.3.0-r2.ebuild) | 27 |
7 files changed, 19 insertions, 184 deletions
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index 3cc72d106bb9..b1691ef7f837 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,13 +1,9 @@ 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-fix-lib-paths.patch 675 BLAKE2B 88c552a5b4db246bd63297ebc9f002aa4ed541cc9521e8f651194609d4040e22375149f1d5ce0957e8d4b69ceb5a5cc425894f7c40ba86db4204de4888528f06 SHA512 7ac1e4611e81cc80fd37dbf348fda1ca2707ca9b28c95c328614b91167ae70e477afd1730a585a2834d31d5826ac68d9816c9ecd227670b81af4e7dea238eef3 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 -DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c +DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab 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-4.3.0-r3.ebuild 2656 BLAKE2B a5134151a03fdcb4ae3f5e5c5daaa0ec251556ac18fe3b66dc1f8d8ab0be6bfcd571b28f12d98c5ac6740e83941912474b5b5795d9e44b889f9d4f2bca9385d8 SHA512 d32e85250fa166d4d03b437f3ac801d38466878626f6a743e6719295343c6271f067467a78891f8d16c95023851d8e17cf646a9cdd4dfa34bbd2eec54c681023 -EBUILD pillow-5.2.0.ebuild 2726 BLAKE2B 2b0a513576f3dac3ddf69486e6eaa892c90b58f998d2234a114fe96bb0ff98fcd8991bb519623c609531c9d5972e23b17fd86e4604c304a91141806367eecc26 SHA512 15d5dfa2920fffc4d30577f686fcaa74d907d444ee23867aa7286308397ea80c47465a75f712b1a9f62012905c590e32d9ddd362c29e6682194e74ef47488706 +EBUILD pillow-5.2.0.ebuild 2723 BLAKE2B d6ea78cc9c4bcc83d6778397cf441365653bcaa0347ff9392986e5750e186fdfbcd499d53e3dc80f2521008655fc428171fc12301780c63d5b15b358b84602da SHA512 e00fec07dc7fb04064b3de979ccd6ce7cf5f8a96fcba63ccd87dd4b70d09fcd6f4dbdebc2479296d9ad4e1f1b9477922d53267264261e1d01211f865827e41ad +EBUILD pillow-5.3.0.ebuild 2331 BLAKE2B d453688d152bd345242abd0bc55f51e35ebf8be5fc623cb121287b4ade989021deb10c226a77cfb4dea439df040d1befff2ef176d2ab3511485630d42d640cea SHA512 2799810b31ebf952d513221f81e169b797d774944a539f4a52104e855f3ec9714f7fc1004f6c080664ee26aa0e19ccfb4d459d9277e3bcf172e0936a12613df5 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a 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 deleted file mode 100644 index 211ef7ac58d3..000000000000 --- a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/files/pillow-4.3.0-no-qt.patch b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch deleted file mode 100644 index 231c605b8347..000000000000 --- a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/files/pillow-4.3.0-no-scripts.patch b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch deleted file mode 100644 index c30b00d54d70..000000000000 --- a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-r3.ebuild b/dev-python/pillow/pillow-4.3.0-r3.ebuild deleted file mode 100644 index a799e79a1d3a..000000000000 --- a/dev-python/pillow/pillow-4.3.0-r3.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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 04ae41085612..2fe691b736fe 100644 --- a/dev-python/pillow/pillow-5.2.0.ebuild +++ b/dev-python/pillow/pillow-5.2.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy ) PYTHON_REQ_USE='tk?,threads(+)' inherit distutils-r1 virtualx @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="HPND" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" REQUIRED_USE="test? ( jpeg tiff )" diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild b/dev-python/pillow/pillow-5.3.0.ebuild index 25dddfce611f..d05df3d9e900 100644 --- a/dev-python/pillow/pillow-4.3.0-r2.ebuild +++ b/dev-python/pillow/pillow-5.3.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy ) PYTHON_REQ_USE='tk?,threads(+)' -inherit distutils-r1 eutils virtualx +inherit distutils-r1 virtualx MY_PN=Pillow MY_P=${MY_PN}-${PV} @@ -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 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" REQUIRED_USE="test? ( jpeg tiff )" @@ -39,7 +39,7 @@ DEPEND="${RDEPEND} dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] ) test? ( - dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] media-gfx/imagemagick[png] ) " @@ -47,9 +47,7 @@ DEPEND="${RDEPEND} 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 + "${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch" ) python_configure_all() { @@ -76,20 +74,21 @@ python_compile_all() { python_test() { "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - virtx nosetests -vx Tests/test_*.py + # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed + virtx pytest -vx Tests/test_*.py -p no:relaxed } python_install() { - python_doheader libImaging/*.h + 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 examples - dodoc Scripts/* - docompress -x /usr/share/doc/${PF}/examples + docinto example + dodoc docs/example/* + docompress -x /usr/share/doc/${PF}/example fi distutils-r1_python_install_all } |