From 4277f1aabd23901cbb3774177098432bb214291b Mon Sep 17 00:00:00 2001 From: Horea Christian Date: Fri, 11 Jan 2019 12:06:19 +0100 Subject: [PATCH] Upstreamed to main overlay https://bugs.gentoo.org/670234#c11 --- dev-python/pillow/Manifest | 4 - .../files/pillow-3.4.2-no-scripts.patch | 12 -- .../files/pillow-5.2.0-fix-lib-paths.patch | 16 --- .../files/pillow-5.4.1-pkg-config.patch | 28 ----- .../files/pillow-5.4.1-toolchain-paths.patch | 12 -- dev-python/pillow/metadata.xml | 19 ---- dev-python/pillow/pillow-3.4.2-r1.ebuild | 101 ----------------- dev-python/pillow/pillow-5.2.0.ebuild | 103 ----------------- dev-python/pillow/pillow-5.3.0.ebuild | 94 ---------------- dev-python/pillow/pillow-5.4.1.ebuild | 105 ------------------ 10 files changed, 494 deletions(-) delete mode 100644 dev-python/pillow/Manifest delete mode 100644 dev-python/pillow/files/pillow-3.4.2-no-scripts.patch delete mode 100644 dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch delete mode 100644 dev-python/pillow/files/pillow-5.4.1-pkg-config.patch delete mode 100644 dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch delete mode 100644 dev-python/pillow/metadata.xml delete mode 100644 dev-python/pillow/pillow-3.4.2-r1.ebuild delete mode 100644 dev-python/pillow/pillow-5.2.0.ebuild delete mode 100644 dev-python/pillow/pillow-5.3.0.ebuild delete mode 100644 dev-python/pillow/pillow-5.4.1.ebuild diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest deleted file mode 100644 index 76ee133..0000000 --- a/dev-python/pillow/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 -DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c -DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab -DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62 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 a8aa0ec..0000000 --- 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.2.0-fix-lib-paths.patch b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch deleted file mode 100644 index b736818..0000000 --- a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py b/setup.py -index 761d552c..c4a55092 100755 ---- a/setup.py -+++ b/setup.py -@@ -435,6 +435,11 @@ class pil_build_ext(build_ext): - _add_directory(include_dirs, - os.path.join(best_path, 'include')) - -+ # The logic above fails in many cases (such as pypy builds) and we fix -+ # it here by making sure we look in standard places first. -+ library_dirs = ['/usr/lib64', '/usr/lib'] + library_dirs -+ include_dirs = ['/usr/include'] + include_dirs -+ - # - # insert new dirs *before* default libs, to avoid conflicts - # between Python PYD stub libs and real libraries 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 ec227b3..0000000 --- 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 d3e95ee..0000000 --- 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/metadata.xml b/dev-python/pillow/metadata.xml deleted file mode 100644 index 2702814..0000000 --- a/dev-python/pillow/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - vdupras@gentoo.org - Virgil Dupras - - - python@gentoo.org - Python - - - Build with Image Quantization Library support - - - Pillow - pillow-dev/pillow - - 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 e0bec4a..0000000 --- a/dev-python/pillow/pillow-3.4.2-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) -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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib" - -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}] -