From: Maxim Koltsov Date: Wed, 21 Dec 2011 07:32:38 +0000 (+0000) Subject: Revision bump, add lcms depend and use flag, bug 381689. Thanks to Chris Mayo X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d23460fd61c5cf9d696eca5c49ca3bc445d02038;p=gentoo.git Revision bump, add lcms depend and use flag, bug 381689. Thanks to Chris Mayo Package-Manager: portage-2.1.10.40/cvs/Linux x86_64 --- diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog index 300d36252015..b0c5f5612e35 100644 --- a/dev-python/imaging/ChangeLog +++ b/dev-python/imaging/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/imaging # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.64 2011/07/07 23:26:15 neurogeek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.65 2011/12/21 07:32:38 maksbotan Exp $ + +*imaging-1.1.7-r1 (21 Dec 2011) + + 21 Dec 2011; Maxim Koltsov +imaging-1.1.7-r1.ebuild, + +files/imaging-1.1.7-nolcms.patch: + Revision bump, add lcms depend and use flag, bug 381689. Thanks to Chris Mayo 07 Jul 2011; Jesus Rivero imaging-1.1.7.ebuild: Fixed shebang in Scripts/pilfont.py wrt bug #371117 diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest index 1bbc24e8d736..b9e17249a8de 100644 --- a/dev-python/imaging/Manifest +++ b/dev-python/imaging/Manifest @@ -1,18 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX imaging-1.1.7-giftrans.patch 530 RMD160 dd671761f9ab3cf9407f506b602ae63fbf5ea917 SHA1 ca83d2ab1ddf600528638c3702bd78c600ad4d43 SHA256 70af27dc98f63bb3e625685ba82e6660f7b605453a1f995e4ca420af49c49c6f AUX imaging-1.1.7-missing-math.patch 717 RMD160 8e74a10a8925e93bbf9f7cad25e98d29d60852bc SHA1 0492077180017b9d3878cd001780ddd2ec836eb1 SHA256 9bce95374278416d183a7a5dd67de7d4b0c4e98bb7ee61dc29821a9fe2ae3a15 AUX imaging-1.1.7-no-xv.patch 691 RMD160 4469847faf7e380421715f985a4b9a98a874417f SHA1 b66c55a7dc10e1df78bc99d0a9eb497e97bec6b9 SHA256 d692f9085fefb06559ee63628852ce72a498657bccdd3ba500e8278ae22b145a +AUX imaging-1.1.7-nolcms.patch 485 RMD160 9ad8d2d234a12384e600b7d62a9a050856c10bd7 SHA1 99f529d8dff0165de5cb4c2aec103e93024ed11c SHA256 e70929b5ef1878e8692504d678113c799ad6d1fdc171e437d5d6080a890751b3 AUX imaging-1.1.7-sane.patch 401 RMD160 11fe942260f5084c22ce1f3d526ba39bcee8faaa SHA1 64fbec2a3621f086d0907c9c1ce50743fd548839 SHA256 9d6bc8d5134bdaa199bc39e793a46dad42c576598166718a2594763e1e1dbf55 DIST Imaging-1.1.7.tar.gz 498749 RMD160 9af570fe100e250a4860314341fe3e6d695d7fde SHA1 76c37504251171fda8da8e63ecb8bc42a69a5c81 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 +EBUILD imaging-1.1.7-r1.ebuild 2689 RMD160 4adca3abe689d895e86362bae99bf3dd6d95c634 SHA1 5ea1999c8d27d228b9f2285d002cf64bb6fe90c5 SHA256 825e784c74aa45e2b9db3f8b12bdf33b1f8b6b76d8894be97a2ca11e8ed7e65e EBUILD imaging-1.1.7.ebuild 2570 RMD160 ce031c18addb398cebe5444eee7ae0e175fc4443 SHA1 4e6f88d7df0033018b448d1dc5d9903d8c701211 SHA256 1753a29fdfad73a434171e016c2cbef1c2f1066ae61850cb95743af7025bc986 -MISC ChangeLog 11468 RMD160 5fd3d998db5bbcd4a9267817d2568da690ba2048 SHA1 4a4b2ad021cc0c2950f3445e52c6161a963e6d85 SHA256 8e3c0f21d13b280134258d93617ea27a8f8e4d4bbb86d19713b988a3b064a6c0 +MISC ChangeLog 11697 RMD160 f9d370c574ee354913073b2d27a7c6faa555b01a SHA1 1af00c4e7dc4ad4c3b21f7dce9e1dd694ab160a5 SHA256 6fafb0df76643d47077e74553df88d91b28e379ab422418f6b5fedf4f7796cfa MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAk4WQ4cACgkQdIssYB9vBoOLwwCfXOPhXwxtmyqhTQ78eVIl6gaJ -k1UAnAnPioqWYvsZNl3aqBZ3Dsl/2r4Q -=UmzD ------END PGP SIGNATURE----- diff --git a/dev-python/imaging/files/imaging-1.1.7-nolcms.patch b/dev-python/imaging/files/imaging-1.1.7-nolcms.patch new file mode 100644 index 000000000000..e087cd301dd5 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-nolcms.patch @@ -0,0 +1,13 @@ +--- setup.py.orig ++++ setup.py 2011-09-04 +@@ -264,10 +264,6 @@ + if dir: + add_directory(self.compiler.include_dirs, dir, 0) + +- if find_include_file(self, "lcms.h"): +- if find_library_file(self, "lcms"): +- feature.lcms = "lcms" +- + if _tkinter and find_include_file(self, "tk.h"): + # the library names may vary somewhat (e.g. tcl84 or tcl8.4) + version = TCL_VERSION[0] + TCL_VERSION[2] diff --git a/dev-python/imaging/imaging-1.1.7-r1.ebuild b/dev-python/imaging/imaging-1.1.7-r1.ebuild new file mode 100644 index 000000000000..7f562d8bcd4b --- /dev/null +++ b/dev-python/imaging/imaging-1.1.7-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2011 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.1 2011/12/21 07:32:38 maksbotan Exp $ + +EAPI="3" +PYTHON_DEPEND="2" +PYTHON_USE_WITH="tk" +PYTHON_USE_WITH_OPT="tk" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython" + +inherit eutils distutils + +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="as-is" +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" + +DEPEND="virtual/jpeg + media-libs/freetype:2 + lcms? ( media-libs/lcms:0[python] ) + scanner? ( media-gfx/sane-backends ) + X? ( x11-misc/xdg-utils )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +DOCS="CHANGES CONTENTS" + +pkg_setup() { + PYTHON_MODNAME="PIL $(use scanner && echo sane.py)" + python_pkg_setup +} + +src_prepare() { + distutils_src_prepare + + epatch "${FILESDIR}/${P}-no-xv.patch" + 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 + + # Add shebang. + sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \ + || die "sed failed adding shebang" + + sed -i \ + -e "s:/usr/lib\":/usr/$(get_libdir)\":" \ + -e "s:\"lib\":\"$(get_libdir)\":g" \ + setup.py || die "sed failed" + + if ! use tk; then + # Make the test always fail + sed -i \ + -e 's/import _tkinter/raise ImportError/' \ + setup.py || die "sed failed" + fi +} + +src_compile() { + distutils_src_compile + + if use scanner; then + pushd Sane > /dev/null + distutils_src_compile + popd > /dev/null + fi +} + +src_test() { + tests() { + PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" selftest.py + } + python_execute_function tests +} + +src_install() { + distutils_src_install + + if use doc; then + dohtml Docs/* || die "dohtml failed" + fi + + if use scanner; then + pushd Sane > /dev/null + docinto sane + DOCS="CHANGES sanedoc.txt" distutils_src_install + popd > /dev/null + fi + + # Install headers required by media-gfx/sketch. + install_headers() { + insinto "$(python_get_includedir)" + doins libImaging/Imaging.h + doins libImaging/ImPlatform.h + } + python_execute_function install_headers + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins Scripts/* || die "doins failed" + + if use scanner; then + insinto /usr/share/doc/${PF}/examples/sane + doins Sane/demo_*.py || die "doins failed" + fi + fi +}