From 67fda3bf99c85a6cba632db976844a836bc96947 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 30 Dec 2014 18:23:20 +0000 Subject: [PATCH] Drop lcms support, bug 526808. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- dev-python/imaging/ChangeLog | 6 +- dev-python/imaging/Manifest | 19 +++- dev-python/imaging/imaging-1.1.7-r1.ebuild | 11 +-- dev-python/imaging/imaging-1.1.7-r2.ebuild | 10 +- dev-python/imaging/imaging-1.1.7-r4.ebuild | 104 --------------------- dev-python/imaging/imaging-1.1.7-r5.ebuild | 8 +- 6 files changed, 31 insertions(+), 127 deletions(-) delete mode 100644 dev-python/imaging/imaging-1.1.7-r4.ebuild diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog index 4d2b89143eaf..8cdbbd2cd570 100644 --- a/dev-python/imaging/ChangeLog +++ b/dev-python/imaging/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/imaging # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.94 2014/12/18 20:30:01 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.95 2014/12/30 18:23:18 floppym Exp $ + + 30 Dec 2014; Mike Gilbert -imaging-1.1.7-r4.ebuild, + imaging-1.1.7-r1.ebuild, imaging-1.1.7-r2.ebuild, imaging-1.1.7-r5.ebuild: + Drop lcms support, bug 526808. 18 Dec 2014; Patrice Clement imaging-1.1.7-r4.ebuild: Added fix to -r4 file accidentally. Removing it. diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest index 3063b7631e26..b1fb2d80e02b 100644 --- a/dev-python/imaging/Manifest +++ b/dev-python/imaging/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX imaging-1.1.7-dont-run-multiple-viewers.patch 348 SHA256 8b70ee8433868dd5b81d8def418da00a9e51f0c19ca80289dad5e01363f4921a SHA512 adf8c836ab1526a78eeaf043f86c57bf76ffbf1c11d9c0da4678538f18de5a33ba0a44d700c3f31c5e6ad8aa9fdf45687b1ba60d8648d58e2fe07249ac9b1fa5 WHIRLPOOL 2905a75bd313da27506c69a6222bbb01bb9461120c90c89cb37383f1d1dd2dcb629bc304c9014af6f2d19dfe7fe384758ba4578fa890ca2068e2807237061263 AUX imaging-1.1.7-ft-header-include.patch 432 SHA256 5edaf0cb22b62aa0bb1626fd243c728323c7e6a3ca884bdfa63a7fbcf089bffb SHA512 2fa491cede517c1adce04aaac9fdad8ea8ccc5409d11c0da514995149476cb7903237ac5d7875210280551a2c69741f2a91968022957b21d73c1bd35956be632 WHIRLPOOL 4a26117d7b7add5aa14a44964da83248e4f1667c481f233384dd30aa30e47e34d3a7316ef28d4286f88cb19725483dacc438a0e72ca7866211816980310d50b3 AUX imaging-1.1.7-giftrans.patch 530 SHA256 70af27dc98f63bb3e625685ba82e6660f7b605453a1f995e4ca420af49c49c6f SHA512 104e1685f4a01a7c6743d80328c7738b19a04415e4f941f5155e1f27237bd6db4dcb829b20b749d36031333ff44603c5d0780ccf48635d1049d236e2a458e19d WHIRLPOOL bcf324b2e85ce89ce15344c18abe2c55263f3107f127db86fbce37706bf1cbae411573bfbe27b5132114aec2002452077c38e237b2c089a8026639da5ce5def4 @@ -6,9 +9,15 @@ AUX imaging-1.1.7-no-xv.patch 691 SHA256 d692f9085fefb06559ee63628852ce72a498657 AUX imaging-1.1.7-nolcms.patch 485 SHA256 e70929b5ef1878e8692504d678113c799ad6d1fdc171e437d5d6080a890751b3 SHA512 511c497ddf1a3f04f9b4e8d5c6f613900f2d3ce76c24e554d6363c169841a581d191315ae240a2622210f275a903226a6d36e534e4f3f2282190a4d657f63bf4 WHIRLPOOL dc20ee1a69808e91f3a5a841309ee79e9ceb908130644578eee91e31724946c7003dcb5699cf579c091092e5133d80dd6e644c7efa478961ed091fc2d50a18ea AUX imaging-1.1.7-sane.patch 401 SHA256 9d6bc8d5134bdaa199bc39e793a46dad42c576598166718a2594763e1e1dbf55 SHA512 2724ea7dc3cc77a779d2145173714c22950e6d757318133b2049357731eb8c2102c5ed366670a4c6ce0b50b3f521d6d3c9614e74bb0ce01047af89ffce2595e4 WHIRLPOOL 18ef51b1a1d829ed971e7b814389f514ada377bba7eb04f9a3299eccae3db5966957112359ecbacf9212d45df157410618f4560c633d593b847d608bbfd31617 DIST Imaging-1.1.7.tar.gz 498749 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 SHA512 fec2d39b4db3cb33cd7e7895aba4c3a8a5d4cff28decb9106c88e392cb848edf5593fcd77d11994bb16321837fdb26958787dac2c86d6f7c09996f466bac11f1 WHIRLPOOL e610b4097723f77de4c495537c64741ee4bd996f89d12e2e7853fb8f09028d02fa46920a86827f263eb6324a9063d2321ff865c80b7f8482b19f8143500575e8 -EBUILD imaging-1.1.7-r1.ebuild 2721 SHA256 871fba0e3b0d4e46a46834a1623ce5354fd94fdbe13396d05da5d82c97fef47d SHA512 58c432ec574c6ca43ec6cd1042f542f774ab38a42bff469e714274b30ba6854a5a3a3b63cc714896623e6fa4d28edf8639aa0898da65d14ad2631944b9b46527 WHIRLPOOL 664d45effef8751a13f8bc0beea9961af964f4a62522d3dcd5a0c145c086a9a0c790dad27c354a329734a774ce3f61f967e19e156a7581d8fc4882bb9ad616d2 -EBUILD imaging-1.1.7-r2.ebuild 2385 SHA256 5e37618dfe0592034e3849744049b301551f31917aa1658179de53db404887c0 SHA512 e27e9273077e83dd41a9a79e27b540c80d4323a6364d6669a1efefdce237271cbbca9f0b8f18dc2ebd0941d584d4f4213bdc4a02e0952338bafdbbfbccb30d53 WHIRLPOOL ec90b1a9f4099a274f67e5a7ef1bffbe849c03599f7df4b98153a08fbaff45af588793785954a4c7ebef4b7f66d80ca5790f9e5b2b2190a4cd37652ab80435aa -EBUILD imaging-1.1.7-r4.ebuild 2452 SHA256 42c72cf919bf2cbf3b838c2383bcda72f01a745e7fa39352e0efa7742c355c35 SHA512 b1f831e7167b942fea1387bb9da1279e6edb5a0e08a2fd2030f6172294760c6897910c804fda5c18fe0c2977259e6b7ff4ae5099fc1ba32ff0d17af8d3611a18 WHIRLPOOL 096277864b842c056431e8dbd8ecb90e31c4091e8d78fcbe0418177619c402c947dfdb745cb62e535b13a051bd6e8604d52aa5955c018d629bfbd6bd9b3378d9 -EBUILD imaging-1.1.7-r5.ebuild 2505 SHA256 6c5e9b4f1d583c8cd91fe0df4bb748acaeaf24223e2937f436033b9613de08b2 SHA512 4f6afc7ddd8dd332a7d995daebf542c77e09552c40bdbde419b902efbc9191f81b8f0f6c40fb9fec706ac4b22c523069a4c416aa83af441be3f050ac65479102 WHIRLPOOL 87a0330e1e69f510c64e9f958dad4b00ffc0ea2edf919edc2a891dfa2f0f1ff04cfc684d2c5d681d3e12e25a5ddbba56af0503a111cfb3030f77dd71fe88b56e -MISC ChangeLog 16319 SHA256 f950d44bf756649ccf4274ff00bc255815a716530c481a86c76852ce1da5dc41 SHA512 c804400c4ead67e8e65e890d47b1377af3e08f123fcf1a780fe2783c0a80614b057068140af2442361cc1a938607f0879fff895054b1531fb7a3766ca8e31dd2 WHIRLPOOL ff231664fb81a91716585d653693a86cb0c4f4e0dc34e0b7a1700d32682993c076c0edb8f9657a970884866c5c34b74a905ddcf06c714da5d7763a1496e6cdbf +EBUILD imaging-1.1.7-r1.ebuild 2661 SHA256 5c6762af5f5cb10dfffd8b45135700da530c06496f7e9d97940ff87b4ae06655 SHA512 88bc88e28be5b4d84ef53c3196902c80e40476696873f6eced18e475ef813439de99a349bce150b3d33d1505b1759908209727c0fa8a4dd731e0a5f0700962d9 WHIRLPOOL f85be461b352ac31800b28d235b5856527ad4cc61fc26357d21d518f67348bf89e81bbf153fe0f5aebc1287a08496152074fbae9ed9fc6c939db0f6d3e80b78c +EBUILD imaging-1.1.7-r2.ebuild 2327 SHA256 6011c61cac2f2e1596fe57ed12183258dbd644638d4b120d1e93c5aa6f191fe5 SHA512 203fa99c51cdefa9731f6a2368ee871139f24e37224be5cb00cac9a9e710e20a5d7286c26e33f3d6fa6ec2deeef215d0f4f5a34f939a49ce25dce8df248afe00 WHIRLPOOL 5c274875d5e02bd1fbcbb4bc57e57b9f9c255ad12343c883bc638241646d394fdb10021e19dac5e1963b3aeb707af89ba346d3bf7fa98796d860d7082aa8af07 +EBUILD imaging-1.1.7-r5.ebuild 2520 SHA256 a5398fc7039c3a5cfe186d7e74f7fd0f369a57e37c1fa28e31dce3ace4d83673 SHA512 50d974f2ccb2f424b723b31319ac11400bdc1dfcc88f8bf66639af2c08257d780ce4dfbda9399ac5ed2ff3fbfd3884b46fa47d90ae59f0bee34425f9e0265844 WHIRLPOOL fe398d59072ac049b0ced426392e360e2af2860ef2d5d92ddd835f51e4c9560d8fb85152a7ed40d5239fd1c31f7c5d8a5e51d59840782fcbbabd4fe40dbb6ba0 +MISC ChangeLog 16503 SHA256 837d3cd875b5e4b8b957f33f6b2b2e31cf3945509caceca511fc31450675a657 SHA512 7475644d74d9112c449e2db642c25e0ceee960827196e74a7dd2e4fef4507bd54f1e901aae0e8127a1daefc0b52c7b3118061b3e1ceb0a054505dedb35154a04 WHIRLPOOL 5ffee2b9ce2a2022d3c02ab76298436a3411b9852fb1226fea9e70fc9a6d168a019ad1c298597cdb59084fa20a035fb5d99d587e7e90dba2c892bddc6f59a753 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iF4EAREIAAYFAlSi7ZcACgkQC77qH+pIQ6QwywEAyknubt2KrfuMcg/vlG02nk8r +Wez7Fwl+de1Wm0yDM54BAKRPuLo+LJtWklIGBjOns55LWClH7rHZKWmvucIfj8LJ +=roEx +-----END PGP SIGNATURE----- diff --git a/dev-python/imaging/imaging-1.1.7-r1.ebuild b/dev-python/imaging/imaging-1.1.7-r1.ebuild index 7bc3951454be..b945348fa315 100644 --- a/dev-python/imaging/imaging-1.1.7-r1.ebuild +++ b/dev-python/imaging/imaging-1.1.7-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.13 2013/05/28 22:47:40 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.14 2014/12/30 18:23:18 floppym Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -20,11 +20,10 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz" LICENSE="HPND" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc examples lcms scanner tk X" +IUSE="doc examples scanner tk X" DEPEND="virtual/jpeg media-libs/freetype:2 - lcms? ( media-libs/lcms:0 ) scanner? ( media-gfx/sane-backends ) X? ( x11-misc/xdg-utils )" RDEPEND="${DEPEND}" @@ -46,9 +45,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-sane.patch" epatch "${FILESDIR}/${P}-giftrans.patch" epatch "${FILESDIR}/${P}-missing-math.patch" - if ! use lcms; then - epatch "${FILESDIR}/${P}-nolcms.patch" - fi + epatch "${FILESDIR}/${P}-nolcms.patch" # Add shebang. sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \ diff --git a/dev-python/imaging/imaging-1.1.7-r2.ebuild b/dev-python/imaging/imaging-1.1.7-r2.ebuild index c625b9e5de27..f2ffc7987274 100644 --- a/dev-python/imaging/imaging-1.1.7-r2.ebuild +++ b/dev-python/imaging/imaging-1.1.7-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v 1.6 2013/09/05 18:46:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v 1.7 2014/12/30 18:23:18 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -17,11 +17,10 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz" LICENSE="HPND" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc examples lcms scanner tk X" +IUSE="doc examples scanner tk X" DEPEND="virtual/jpeg media-libs/freetype:2 - lcms? ( media-libs/lcms:0 ) scanner? ( media-gfx/sane-backends ) X? ( x11-misc/xdg-utils )" RDEPEND="${DEPEND}" @@ -35,10 +34,9 @@ python_prepare_all() { "${FILESDIR}/${P}-sane.patch" "${FILESDIR}/${P}-giftrans.patch" "${FILESDIR}/${P}-missing-math.patch" + "${FILESDIR}/${P}-nolcms.patch" ) - use lcms || PATCHES+=( "${FILESDIR}/${P}-nolcms.patch" ) - # Add shebang. sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \ || die "sed failed adding shebang" diff --git a/dev-python/imaging/imaging-1.1.7-r4.ebuild b/dev-python/imaging/imaging-1.1.7-r4.ebuild deleted file mode 100644 index 070a75086bf2..000000000000 --- a/dev-python/imaging/imaging-1.1.7-r4.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.6 2014/12/18 20:30:01 monsieurp Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE='tk?' - -inherit distutils-r1 - -MY_P=Imaging-${PV} - -DESCRIPTION="Python Imaging Library (PIL)" -HOMEPAGE="http://www.pythonware.com/products/pil/index.htm" -SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc examples jpeg lcms scanner test tiff tk truetype zlib" - -RDEPEND=" - truetype? ( media-libs/freetype:2 ) - jpeg? ( virtual/jpeg ) - lcms? ( media-libs/lcms:0 ) - scanner? ( media-gfx/sane-backends ) - tiff? ( media-libs/tiff ) - zlib? ( sys-libs/zlib ) - !dev-python/pillow" -DEPEND="${RDEPEND}" -RDEPEND+=" !dev-python/pillow" - -# Tests don't handle missing jpeg, tiff & zlib properly. -REQUIRED_USE="test? ( jpeg tiff zlib )" - -S="${WORKDIR}/${MY_P}" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${P}-no-xv.patch" - "${FILESDIR}/${P}-sane.patch" - "${FILESDIR}/${P}-giftrans.patch" - "${FILESDIR}/${P}-missing-math.patch" - "${FILESDIR}/${P}-ft-header-include.patch" - ) - - # Add shebangs. - sed -e "1i#!/usr/bin/env python" -i Scripts/*.py || die - - # Disable all the stuff we don't want. - local f - for f in jpeg lcms tiff tk zlib; do - if ! use ${f}; then - sed -i -e "s:feature.${f} =:& None #:" setup.py || die - fi - done - if ! use truetype; then - sed -i -e 's:feature.freetype =:& None #:' setup.py || die - fi - - distutils-r1_python_prepare_all -} - -# XXX: split into two ebuilds? -wrap_phase() { - "${@}" - - if use scanner; then - cd Sane || die - "${@}" - fi -} - -python_compile() { - wrap_phase distutils-r1_python_compile -} - -python_test() { - "${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}" -} - -python_install() { - python_doheader libImaging/{Imaging.h,ImPlatform.h} - - wrap_phase distutils-r1_python_install -} - -python_install_all() { - use doc && local HTML_DOCS=( Docs/. ) - use examples && local EXAMPLES=( Scripts/. ) - - distutils-r1_python_install_all - - if use scanner; then - docinto sane - dodoc Sane/{CHANGES,README,sanedoc.txt} - fi - - if use examples && use scanner; then - docinto examples/sane - dodoc Sane/demo_*.py - docompress -x /usr/share/${PF}/examples - fi -} diff --git a/dev-python/imaging/imaging-1.1.7-r5.ebuild b/dev-python/imaging/imaging-1.1.7-r5.ebuild index 84a80bd18c95..86745a28cac7 100644 --- a/dev-python/imaging/imaging-1.1.7-r5.ebuild +++ b/dev-python/imaging/imaging-1.1.7-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v 1.1 2014/12/18 20:24:34 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v 1.2 2014/12/30 18:23:18 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -17,12 +17,11 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz" LICENSE="HPND" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc examples jpeg lcms scanner test tiff tk truetype zlib" +IUSE="doc examples jpeg scanner test tiff tk truetype zlib" RDEPEND=" truetype? ( media-libs/freetype:2 ) jpeg? ( virtual/jpeg ) - lcms? ( media-libs/lcms:0 ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff ) zlib? ( sys-libs/zlib ) @@ -50,7 +49,7 @@ python_prepare_all() { # Disable all the stuff we don't want. local f - for f in jpeg lcms tiff tk zlib; do + for f in jpeg tiff tk zlib; do if ! use ${f}; then sed -i -e "s:feature.${f} =:& None #:" setup.py || die fi @@ -58,6 +57,7 @@ python_prepare_all() { if ! use truetype; then sed -i -e 's:feature.freetype =:& None #:' setup.py || die fi + sed -i -e "s:feature.lcms =:& None #:" setup.py || die distutils-r1_python_prepare_all } -- 2.26.2