From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-979753-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 3D1681396D9
for <garchives@archives.gentoo.org>; Sun, 22 Oct 2017 16:54:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5E3BC2BC08A;
Sun, 22 Oct 2017 16:53:57 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 323C72BC08A
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Oct 2017 16:53:57 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3C17433BF55
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Oct 2017 16:53:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B934582C
for <gentoo-commits@lists.gentoo.org>; Sun, 22 Oct 2017 16:53:54 +0000 (UTC)
From: "Patrick Lauer" <patrick@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Patrick Lauer" <patrick@gentoo.org>
Message-ID: <1508691230.758e6ebc05309b6e77209d1be64577da49e917ac.patrick@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/pillow/metadata.xml dev-python/pillow/pillow-4.2.1-r1.ebuild dev-python/pillow/pillow-4.2.1-r2.ebuild dev-python/pillow/pillow-4.2.1.ebuild
X-VCS-Directories: dev-python/pillow/
X-VCS-Committer: patrick
X-VCS-Committer-Name: Patrick Lauer
X-VCS-Revision: 758e6ebc05309b6e77209d1be64577da49e917ac
X-VCS-Branch: master
Date: Sun, 22 Oct 2017 16:53:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dff26c54-0fa5-4610-bc42-531eea73ed98
X-Archives-Hash: 75f1630ebaaafd0977b9bf802714d11a
commit: 758e6ebc05309b6e77209d1be64577da49e917ac
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 16:52:34 2017 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 16:53:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758e6ebc
dev-python/pillow: jpeg dependency is unconditional #632418
Package-Manager: Portage-2.3.12, Repoman-2.3.3
dev-python/pillow/metadata.xml | 1 -
...llow-4.2.1-r1.ebuild => pillow-4.2.1-r2.ebuild} | 9 ++-
dev-python/pillow/pillow-4.2.1.ebuild | 83 ----------------------
3 files changed, 4 insertions(+), 89 deletions(-)
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index d641c40047b..c3f74b98266 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -6,7 +6,6 @@
<name>Python</name>
</maintainer>
<use>
- <flag name="ole">Add support for OLE2 image format</flag>
<flag name="imagequant">Build with Image Quantization Library support</flag>
</use>
<upstream>
diff --git a/dev-python/pillow/pillow-4.2.1-r1.ebuild b/dev-python/pillow/pillow-4.2.1-r2.ebuild
similarity index 89%
rename from dev-python/pillow/pillow-4.2.1-r1.ebuild
rename to dev-python/pillow/pillow-4.2.1-r2.ebuild
index 1621cc8edf3..785dfedc3b9 100644
--- a/dev-python/pillow/pillow-4.2.1-r1.ebuild
+++ b/dev-python/pillow/pillow-4.2.1-r2.ebuild
@@ -18,17 +18,17 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="HPND"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib"
-REQUIRED_USE="test? ( jpeg tiff )"
+REQUIRED_USE="test? ( tiff )"
RDEPEND="
dev-python/olefile[${PYTHON_USEDEP}]
imagequant? ( media-gfx/libimagequant:0 )
- jpeg? ( virtual/jpeg:0 )
+ virtual/jpeg:0
jpeg2k? ( media-libs/openjpeg:2= )
lcms? ( media-libs/lcms:2= )
- tiff? ( media-libs/tiff:0=[jpeg?] )
+ tiff? ( media-libs/tiff:0=[jpeg] )
truetype? ( media-libs/freetype:2= )
webp? ( media-libs/libwebp:0= )
zlib? ( sys-libs/zlib:0= )"
@@ -48,7 +48,6 @@ src_compile() {
distutils-r1_src_compile \
--disable-raqm \
$(use_enable truetype freetype) \
- $(use_enable jpeg) \
$(use_enable jpeg2k jpeg2000) \
$(use_enable lcms) \
$(use_enable tiff) \
diff --git a/dev-python/pillow/pillow-4.2.1.ebuild b/dev-python/pillow/pillow-4.2.1.ebuild
deleted file mode 100644
index a22b7b1fd8b..00000000000
--- a/dev-python/pillow/pillow-4.2.1.ebuild
+++ /dev/null
@@ -1,83 +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} )
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k ole lcms test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
- imagequant? ( media-gfx/libimagequant:0 )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- ole? ( dev-python/olefile[${PYTHON_USEDEP}] )
- tiff? ( media-libs/tiff:0=[jpeg?] )
- 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}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
- # raqm not in portage yet
- distutils-r1_src_compile \
- --disable-raqm \
- $(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
-}