diff options
Diffstat (limited to 'dev-python/pillow')
| -rw-r--r-- | dev-python/pillow/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch | 12 | ||||
| -rw-r--r-- | dev-python/pillow/metadata.xml | 4 | ||||
| -rw-r--r-- | dev-python/pillow/pillow-5.2.0.ebuild | 22 |
4 files changed, 37 insertions, 6 deletions
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index 37e0fbef0d59..f59334fe4025 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,10 +1,11 @@ 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-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 DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb 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 2159 BLAKE2B 28f748713a20336e7146254ecdb0b18f58dcba5e77a30cd5753ed28997a2d7d6d98bce011716c3bb38368b551a957c12dbf9a6c6ddfdda31962fb14a640f088f SHA512 1509c48e17f5161bad19b2063af9ca38207a14f38e3ede8ee8d48f4dc0e86b81fdac4bbfa38756acf761d6bc54ab9cd4801e83932cc8556b5991e92b52cfd1ca -MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a +EBUILD pillow-5.2.0.ebuild 2701 BLAKE2B 69e75f027ab441da6b8843322ceef55edb999da8b6dfc854998026aedb59b919ac661c3bfc6525b3673a534441b4fc9e830de2997df56df961adb234cd469a44 SHA512 f2e7ea59baa9383756acdccf9f4153b4f589356795945bb5b4895f285c20a4e8e0c8d5a57909d05e113f65780fe974d49f2e51dad793238cdcaaa849cc0dd205 +MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a diff --git a/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch b/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch new file mode 100644 index 000000000000..4b6cc50eaf5e --- /dev/null +++ b/dev-python/pillow/files/pillow-5.2.0-no-usr-lib.patch @@ -0,0 +1,12 @@ +--- a/setup.py 2018-07-22 22:09:23.840195059 +0300 ++++ a/setup.py 2018-07-22 22:11:43.400626135 +0300 +@@ -258,9 +258,8 @@ + _add_directory(library_dirs, d) + + prefix = sysconfig.get_config_var("prefix") + if prefix: +- _add_directory(library_dirs, os.path.join(prefix, "lib")) + _add_directory(include_dirs, os.path.join(prefix, "include")) + + # + # add platform directories diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml index c3f74b982665..270281456096 100644 --- a/dev-python/pillow/metadata.xml +++ b/dev-python/pillow/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>vdupras@gentoo.org</email> + <name>Virgil Dupras</name> + </maintainer> <maintainer type="project"> <email>python@gentoo.org</email> <name>Python</name> diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild index 1476c3915c58..b4f435d0425c 100644 --- a/dev-python/pillow/pillow-5.2.0.ebuild +++ b/dev-python/pillow/pillow-5.2.0.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) PYTHON_REQ_USE='tk?,threads(+)' -inherit distutils-r1 eutils virtualx +inherit distutils-r1 virtualx MY_PN=Pillow MY_P=${MY_PN}-${PV} @@ -46,6 +46,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${PN}-5.2.0-no-usr-lib.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. @@ -64,13 +68,23 @@ python_configure_all() { ) } +python_compile() { + # Pillow monkeypatches distutils to achieve parallel compilation. This + # conflicts with distutils' builtin parallel computation (since py35) + # and make builds hang. To avoid that, we set MAX_CONCURRENCY=1 to + # disable monkeypatching. Can be removed when/if + # https://github.com/python-pillow/Pillow/pull/3272 is merged. + MAX_CONCURRENCY=1 distutils-r1_python_compile +} + python_compile_all() { use doc && emake -C docs html } python_test() { "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - virtx pytest -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() { |