From f09b0ce404160d570380506fe314f326a9412d33 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Fri, 21 Nov 2014 16:52:02 +0200 Subject: Safe keeping the package dev-python/imaging --- dev-python/imaging/ChangeLog | 431 +++++++++++++++++++++ dev-python/imaging/Manifest | 1 + .../files/imaging-1.1.7-ft-header-include.patch | 20 + .../imaging/files/imaging-1.1.7-giftrans.patch | 14 + .../imaging/files/imaging-1.1.7-missing-math.patch | 20 + dev-python/imaging/files/imaging-1.1.7-no-xv.patch | 18 + .../imaging/files/imaging-1.1.7-nolcms.patch | 13 + dev-python/imaging/files/imaging-1.1.7-sane.patch | 13 + dev-python/imaging/imaging-1.1.7-r1.ebuild | 118 ++++++ dev-python/imaging/imaging-1.1.7-r2.ebuild | 106 +++++ dev-python/imaging/imaging-1.1.7-r4.ebuild | 104 +++++ dev-python/imaging/metadata.xml | 5 + 12 files changed, 863 insertions(+) create mode 100644 dev-python/imaging/ChangeLog create mode 100644 dev-python/imaging/Manifest create mode 100644 dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch create mode 100644 dev-python/imaging/files/imaging-1.1.7-giftrans.patch create mode 100644 dev-python/imaging/files/imaging-1.1.7-missing-math.patch create mode 100644 dev-python/imaging/files/imaging-1.1.7-no-xv.patch create mode 100644 dev-python/imaging/files/imaging-1.1.7-nolcms.patch create mode 100644 dev-python/imaging/files/imaging-1.1.7-sane.patch create mode 100644 dev-python/imaging/imaging-1.1.7-r1.ebuild create mode 100644 dev-python/imaging/imaging-1.1.7-r2.ebuild create mode 100644 dev-python/imaging/imaging-1.1.7-r4.ebuild create mode 100644 dev-python/imaging/metadata.xml diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog new file mode 100644 index 00000000..ab5651a6 --- /dev/null +++ b/dev-python/imaging/ChangeLog @@ -0,0 +1,431 @@ +# 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.92 2014/07/30 01:21:21 vapier Exp $ + + 30 Jul 2014; Mike Frysinger + +files/imaging-1.1.7-ft-header-include.patch, imaging-1.1.7-r4.ebuild: + Fix from Chromium OS for building w/freetype-2.5.3 #508748 by Stefan Kalis. + + 05 Sep 2013; Michał Górny imaging-1.1.7-r2.ebuild, + imaging-1.1.7-r4.ebuild: + Clean up PYTHON_COMPAT from old implementations. + + 31 May 2013; Patrick Lauer metadata.xml: + Drop unused useflag description + + 28 May 2013; Mike Gilbert + -files/imaging-2.0.0-delete_hardcoded_paths.patch, + -files/imaging-2.0.0-libm_linking.patch, -imaging-2.0.0.ebuild, + imaging-1.1.7-r1.ebuild, imaging-1.1.7-r2.ebuild, imaging-1.1.7-r4.ebuild: + Remove imaging-2.0.0, add blocker for dev-python/pillow. + + 28 May 2013; Mike Gilbert imaging-2.0.0.ebuild: + Depend on unzip. + + 28 May 2013; Mike Gilbert + -files/imaging-2.0.0-GifImagePlugin.patch, + -files/imaging-2.0.0-gif_transparency.patch, imaging-2.0.0.ebuild: + Drop GIF transparency patches. + +*imaging-2.0.0 (27 May 2013) + + 27 May 2013; Mike Gilbert + +files/imaging-2.0.0-GifImagePlugin.patch, + +files/imaging-2.0.0-delete_hardcoded_paths.patch, + +files/imaging-2.0.0-gif_transparency.patch, + +files/imaging-2.0.0-libm_linking.patch, +imaging-2.0.0.ebuild, metadata.xml: + Copy dev-python/pillow-2.0.0 to dev-python/imaging-2.0.0 in preparation for a + pkgmove. Apply rebased patches from Arfrever's Progress overlay. Enable + python3 support. Bug 401009. + +*imaging-1.1.7-r4 (07 May 2013) + + 07 May 2013; Mike Gilbert +imaging-1.1.7-r4.ebuild, + -imaging-1.1.7-r3.ebuild: + Revbump for previous change. + + 07 May 2013; Mike Gilbert imaging-1.1.7-r3.ebuild: + Fix installation path for sane demos, bug 468960 by Erik Zeek. + + 24 Apr 2013; Mike Gilbert imaging-1.1.7-r3.ebuild: + Fix typo in HTML_DOCS, bug 466764 by Martin von Gagern. + +*imaging-1.1.7-r3 (21 Apr 2013) + + 21 Apr 2013; Michał Górny +imaging-1.1.7-r3.ebuild: + Backport the ebuild improvements from dev-python/pillow. Remove unnecessary + inherits. Add a fine-grained control over features, and a simpler feature + switch mechanism. Remove unused USE=X, add shebangs to all Python scripts. Use + the new python_doinclude function and EXAMPLES support. + + 24 Feb 2013; Agostino Sarubbo imaging-1.1.7-r2.ebuild: + Stable for x86, wrt bug #447470 + + 24 Feb 2013; Agostino Sarubbo imaging-1.1.7-r2.ebuild: + Stable for amd64, wrt bug #447470 + + 24 Jan 2013; Michał Górny imaging-1.1.7-r2.ebuild: + Fix use of includedir on Prefix. + +*imaging-1.1.7-r2 (16 Jan 2013) + + 16 Jan 2013; Michał Górny +imaging-1.1.7-r2.ebuild: + Migrate to distutils-r1. + + 01 Dec 2012; Tim Harder -imaging-1.1.7.ebuild: + Remove old. + + 01 Dec 2012; Tim Harder imaging-1.1.7.ebuild, + imaging-1.1.7-r1.ebuild: + Fix LICENSE (bug #445416 by ulm). + + 28 May 2012; Raúl Porcel imaging-1.1.7-r1.ebuild: + alpha/ia64/sparc stable wrt #410075 + + 17 Apr 2012; Brent Baude imaging-1.1.7-r1.ebuild: + Marking imaging-1.1.7-r1 ppc64 for bug 410075 + + 17 Apr 2012; Brent Baude imaging-1.1.7-r1.ebuild: + Marking imaging-1.1.7-r1 ppc for bug 410075 + + 04 Apr 2012; Jeff Horelick imaging-1.1.7-r1.ebuild: + marked x86 per bug 410075 + + 03 Apr 2012; Jeroen Roovers imaging-1.1.7-r1.ebuild: + Stable for HPPA (bug #410075). + + 31 Mar 2012; Markus Meier imaging-1.1.7-r1.ebuild: + arm stable, bug #410075 + + 29 Mar 2012; Agostino Sarubbo imaging-1.1.7-r1.ebuild: + Stable for amd64, wrt bug #410075 + + 20 Feb 2012; Patrick Lauer imaging-1.1.7-r1.ebuild, + imaging-1.1.7.ebuild: + Restricting pypy #403783 + + 01 Feb 2012; Mike Gilbert imaging-1.1.7-r1.ebuild, + imaging-1.1.7.ebuild: + Inherit multilib. + + 06 Jan 2012; Markos Chandras imaging-1.1.7-r1.ebuild: + Fix dependencies (bug #381689). Patch by Arfrever. + +*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 + + 25 Feb 2011; Fabian Groffen imaging-1.1.7.ebuild: + Marked ~x64-macos, bug #356447 + + 31 Dec 2010; Arfrever Frehtes Taifersar Arahesis + imaging-1.1.7.ebuild: + Restrict Jython ABIs. + + 07 Nov 2010; Jory A. Pratt imaging-1.1.7.ebuild: + Convert media-libs/jpeg to virtual/jpeg + + 30 Oct 2010; Arfrever Frehtes Taifersar Arahesis + imaging-1.1.7.ebuild: + Update EAPI. Fix dependencies. Fix PYTHON_MODNAME. + + 30 Oct 2010; Arfrever Frehtes Taifersar Arahesis + -imaging-1.1.6-r1.ebuild, -files/imaging-1.1.6-giftrans.patch, + -files/imaging-1.1.6-missing-math.patch, -files/imaging-1.1.6-no-xv.patch, + -files/imaging-1.1.6-sane.patch, -files/imaging-1.1.6-tiffendian.patch: + Delete. + + 07 Mar 2010; Samuli Suominen imaging-1.1.7.ebuild: + amd64 stable wrt #298979 + + 17 Jan 2010; Raúl Porcel imaging-1.1.7.ebuild: + alpha/arm/ia64/sparc stable wrt #298979 + + 12 Jan 2010; nixnut imaging-1.1.7.ebuild: + ppc stable #298979 + + 10 Jan 2010; Brent Baude imaging-1.1.7.ebuild: + stable ppc64, bug 298979 + + 05 Jan 2010; Jeroen Roovers imaging-1.1.7.ebuild: + Stable for HPPA (bug #298979). + + 03 Jan 2010; Christian Faulhammer imaging-1.1.7.ebuild: + stable x86, bug 298979 + +*imaging-1.1.7 (30 Nov 2009) + + 30 Nov 2009; Dirkjan Ochtman +imaging-1.1.7.ebuild, + +files/imaging-1.1.7-giftrans.patch, + +files/imaging-1.1.7-missing-math.patch, +files/imaging-1.1.7-no-xv.patch, + +files/imaging-1.1.7-sane.patch: + Version bump to 1.1.7. TIFF endianness seems to be included. + + 14 Nov 2009; Raúl Porcel imaging-1.1.6-r1.ebuild: + ia64/sparc stable wrt #287560 + + 11 Nov 2009; Brent Baude imaging-1.1.6-r1.ebuild: + Marking imaging-1.1.6-r1 ppc64 for bug 287560 + + 07 Nov 2009; Tobias Klausmann + imaging-1.1.6-r1.ebuild: + Stable on alpha, bug #287560 + + 16 Oct 2009; Jeroen Roovers imaging-1.1.6-r1.ebuild: + Stable for HPPA (bug #287560). + + 10 Oct 2009; Fabian Groffen imaging-1.1.6-r1.ebuild: + Merge from Prefix + + 09 Oct 2009; Markus Meier imaging-1.1.6-r1.ebuild: + amd64/x86 stable, bug #287560 + + 07 Oct 2009; nixnut imaging-1.1.6-r1.ebuild: + ppc stable #287560 + + 22 Sep 2009; Markus Meier imaging-1.1.6-r1.ebuild: + add ~arm + + 01 Aug 2009; Arfrever Frehtes Taifersar Arahesis + imaging-1.1.6-r1.ebuild: + Set SUPPORT_PYTHON_ABIS. + + 15 Jul 2009; Sébastien Fabbro + files/imaging-1.1.6-tiffendian.patch: + Fixed tiff patch for proper tiff handling also with higher resolution + (from Debian). Closing bug #277208 + + 03 Jul 2009; Christian Ruppert imaging-1.1.6-r1.ebuild, + +files/imaging-1.1.6-missing-math.patch: + Add missing -lm links. + + 01 May 2009; Patrick Lauer imaging-1.1.6-r1.ebuild: + Small fix for tests. Fixes #268126, thanks to Oliver Huber + +*imaging-1.1.6-r1 (20 Mar 2009) + + 20 Mar 2009; Sébastien Fabbro + -files/imaging-1.1.4-fPIC.patch, -files/imaging-1.1.4-ft-2.1.9.patch, + -files/imaging-1.1.4-setup.py.patch, +files/imaging-1.1.6-giftrans.patch, + +files/imaging-1.1.6-no-xv.patch, +files/imaging-1.1.6-sane.patch, + +files/imaging-1.1.6-tiffendian.patch, -imaging-1.1.5.ebuild, + imaging-1.1.6.ebuild, +imaging-1.1.6-r1.ebuild: + Added patches for GIF transparency, replace image viewer from xv to + desktop default one with xdg-open, support for TIFF 16 bit endian images + (bug #180549, thanks Tamas Haraszti). Also added unit test. Cleaned old + packages + + 07 Mar 2009; Joseph Jezak imaging-1.1.6.ebuild: + Marked ppc stable for bug #182425. + + 06 Mar 2009; Jeroen Roovers imaging-1.1.6.ebuild: + Stable for HPPA (bug #182454). + + 27 Feb 2009; Brent Baude imaging-1.1.6.ebuild: + stable ppc64, bug 182454 + + 26 Feb 2009; Raúl Porcel imaging-1.1.6.ebuild: + alpha/ia64/sparc stable wrt #182454 + + 25 Feb 2009; Markus Meier imaging-1.1.6.ebuild: + amd64/x86 stable, bug #182454 + + 04 Jul 2007; Ali Polatel imaging-1.1.5.ebuild: + use DOCS, mydoc is deprecated + + 24 Jun 2007; Tiziano Müller imaging-1.1.5.ebuild: + Fixed $ROOT abuse (bug #167271) + + 02 Apr 2007; Peter Weller imaging-1.1.6.ebuild: + Keyworded ~x86-fbsd + + 05 Feb 2007; Jeroen Roovers imaging-1.1.5.ebuild: + Stable for HPPA (inkscape). + +*imaging-1.1.6 (09 Jan 2007) + + 09 Jan 2007; Tiziano Müller + -imaging-1.1.4-r1.ebuild, +imaging-1.1.6.ebuild: + Version bump (bug #160875). Dropped old version. + + 21 Sep 2006; Doug Goldstein imaging-1.1.4-r1.ebuild, + imaging-1.1.5.ebuild: + tcltk -> tcl / tk as per bug #17808 + + 27 Jun 2006; Jeroen Roovers imaging-1.1.5.ebuild: + Marked ~hppa (for inkscape). + + 20 Feb 2006; Markus Rothe imaging-1.1.5.ebuild: + Stable on ppc64 + + 09 Feb 2006; Luca Barbato imaging-1.1.5.ebuild: + Marked ppc + + 08 Feb 2006; Gustavo Zacarias imaging-1.1.5.ebuild: + Stable on sparc + + 07 Feb 2006; Simon Stelling imaging-1.1.5.ebuild: + stable on amd64 + + 06 Feb 2006; Alastair Tse -imaging-1.1.2-r2.ebuild, + -imaging-1.1.3.ebuild, -imaging-1.1.3-r1.ebuild, -imaging-1.1.3-r2.ebuild, + -imaging-1.1.4.ebuild, imaging-1.1.5.ebuild: + stable x86 bump and cleanup + + 06 Feb 2006; Aron Griffis imaging-1.1.5.ebuild: + Mark 1.1.5 stable on alpha + + 02 Feb 2006; Marien Zwart Manifest: + Fix rmd160 digests. + + 01 Feb 2006; Aron Griffis imaging-1.1.5.ebuild: + Mark 1.1.5 stable on ia64 + + 26 Aug 2005; Aron Griffis imaging-1.1.5.ebuild: + add ~ia64 + + 13 Jul 2005; Herbie Hopkins imaging-1.1.5.ebuild: + Multilib fix. + +*imaging-1.1.5 (11 Jun 2005) + + 11 Jun 2005; Fernando Serboncini +imaging-1.1.5.ebuild: + Version bump. + Added sane support. + + 05 Jun 2005; Markus Rothe imaging-1.1.4-r1.ebuild: + Stable on ppc64; dependency for bug #92995 + + 21 May 2005; Markus Rothe imaging-1.1.4-r1.ebuild: + Added ~ppc64 to KEYWORDS + + 21 Apr 2005; Michael Hanselmann + imaging-1.1.4-r1.ebuild: + Stable on ppc. + + 01 Apr 2005; Simon Stelling imaging-1.1.4-r1.ebuild: + stable on amd64 + + 30 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 29 Nov 2004; Michael Sterrett imaging-1.1.4.ebuild: + stable on amd64 again since media-sound/albumart needs it and xv had been + keyworded. + + 22 Nov 2004; Rob Cakebread imaging-1.1.4.ebuild: + Marked ~amd64 as xv is + +*imaging-1.1.4-r1 (22 Nov 2004) + + 22 Nov 2004; Rob Cakebread + imaging-1.1.2-r2.ebuild, imaging-1.1.3-r1.ebuild, imaging-1.1.3-r2.ebuild, + imaging-1.1.3.ebuild, imaging-1.1.4-r1.ebuild, imaging-1.1.4.ebuild: + Added X to IUSE. Closes bug# 72094 + + 21 Nov 2004; Chris Bainbridge : + xv is required by Image.show(). marked ~amd64 as xv is. + + 01 Nov 2004; Joseph Jezak imaging-1.1.3-r2.ebuild: + Marked ppc stable. + + 04 Oct 2004; Bryan Østergaard + +files/imaging-1.1.4-ft-2.1.9.patch, imaging-1.1.4.ebuild: + Fix bug 66040. + + 14 Sep 2004; Jeremy Huddleston imaging-1.1.4.ebuild: + Stable amd64 + + 05 Sep 2004; Sven Wegener : + Fixed ChangeLog header. + + 20 Aug 2004; Rob Cakebread imaging-1.1.2-r2.ebuild, + imaging-1.1.3-r1.ebuild, imaging-1.1.3-r2.ebuild, imaging-1.1.3.ebuild, + imaging-1.1.4.ebuild: + Added DEPEND on media-libs/freetype + +*imaging-1.1.4 (19 Jul 2004) + + 19 Jul 2004; Bryan Østergaard +metadata.xml, + +files/imaging-1.1.4-fPIC.patch, +files/imaging-1.1.4-setup.py.patch, + +imaging-1.1.2-r2.ebuild, +imaging-1.1.3-r1.ebuild, + +imaging-1.1.3-r2.ebuild, +imaging-1.1.3.ebuild, +imaging-1.1.4.ebuild: + Renamed dev-python/Imaging to dev-python/imaging. + + 31 May 2004; Bryan Østergaard Imaging-1.1.4.ebuild: + Stable on alpha. + + 04 May 2004; Bryan Østergaard Imaging-1.1.2-r2.ebuild, + Imaging-1.1.3.ebuild: + Remove default S. + + 25 Apr 2004; Aron Griffis Imaging-1.1.3-r1.ebuild, + Imaging-1.1.3-r2.ebuild, Imaging-1.1.4.ebuild: + Add die following econf for bug 48950 + + 18 Apr 2004; Daniel Ahlberg Imaging-1.1.4.ebuild: + Created -fPIC patch instead of adding fPIC to CFLAGS. + + 28 Mar 2004; Bryan Østergaard Imaging-1.1.2-r2.ebuild, + Imaging-1.1.3-r1.ebuild, Imaging-1.1.3-r2.ebuild, Imaging-1.1.3.ebuild: + Update SRC_URI. + + 14 Mar 2004; Jon Portnoy Imaging-1.1.4.ebuild : + AMD64 keywords. + + 26 Feb 2004; Sven Blumenstein Imaging-1.1.4.ebuild: + Stable on sparc. + + 15 Jul 2003; Alastair Tse Imaging-1.1.4.ebuild, + files/Imaging-1.1.4-setup.py.patch: + add patch to fix installations with tkinter (#24351) + +*Imaging-1.1.4 (02 Jun 2003) + + 02 Jun 2003; Alastair Tse Imaging-1.1.4.ebuild: + removing tk-8.4 workaround because it is fixed in 1.1.4. version bumping and + various ebuild cleanups. + +*Imaging-1.1.3-r2 (16 May 2003) + + 16 May 2003; Alastair Tse Imaging-1.1.3-r2.ebuild: + workaround for new tk-8.4.x. thanks to Hyriand + (#21013) + +*Imaging-1.1.3-r1 (05 Mar 2003) + + 25 Mar 2003; Alastair Tse Imaging-1.1.3-r1.ebuild: + bumping to stable + + 05 Mar 2003; Jason Shoemaker Imaging-1.1.3-r1.ebuild: + Modified to take advantage of distutils.eclass. Removed all but ~x86 arch, + because of the major revision. + +*Imaging-1.1.3 (3 Nov 2002) + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + + 3 Nov 2002; Nicholas Henke Imaging-1.1.3.ebuild : + Bumped version to 1.1.3. + +*Imaging-1.1.2-r2 (1 Feb 2002) + + 20 Oct 2002; Calum Selkirk Imaging-1.1.2-r2.euild : + + Added ppc to KEYWORDS. + + 26 Jul 2002; George Shapovalov Imaging-1.1.2-r2.euild : + added KEYWORDS,SLOT,LICENSE + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest new file mode 100644 index 00000000..68b418ae --- /dev/null +++ b/dev-python/imaging/Manifest @@ -0,0 +1 @@ +DIST Imaging-1.1.7.tar.gz 498749 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 SHA512 fec2d39b4db3cb33cd7e7895aba4c3a8a5d4cff28decb9106c88e392cb848edf5593fcd77d11994bb16321837fdb26958787dac2c86d6f7c09996f466bac11f1 WHIRLPOOL e610b4097723f77de4c495537c64741ee4bd996f89d12e2e7853fb8f09028d02fa46920a86827f263eb6324a9063d2321ff865c80b7f8482b19f8143500575e8 diff --git a/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch new file mode 100644 index 00000000..cdc06839 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-ft-header-include.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/508748 + +fix building w/freetype-2.5.3 + +patch by Jungshik Shin + +--- Imaging-1.1.7/_imagingft.c ++++ Imaging-1.1.7/_imagingft.c +@@ -70,7 +70,11 @@ + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++#include FT_ERRORS_H ++#else + #include ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/dev-python/imaging/files/imaging-1.1.7-giftrans.patch b/dev-python/imaging/files/imaging-1.1.7-giftrans.patch new file mode 100644 index 00000000..1a109d28 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-giftrans.patch @@ -0,0 +1,14 @@ +--- Imaging-1.1.6.orig/PIL/GifImagePlugin.py 2006-12-03 11:37:15.000000000 +0000 ++++ Imaging-1.1.6/PIL/GifImagePlugin.py 2008-10-02 14:51:43.000000000 +0100 +@@ -352,6 +352,11 @@ + for i in range(maxcolor): + s.append(chr(i) * 3) + ++ if im.info.has_key('transparency'): ++ transparentIndex = im.info['transparency'] ++ s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) + ++ chr(transparentIndex) + chr(0)) ++ + return s + + def getdata(im, offset = (0, 0), **params): diff --git a/dev-python/imaging/files/imaging-1.1.7-missing-math.patch b/dev-python/imaging/files/imaging-1.1.7-missing-math.patch new file mode 100644 index 00000000..f4d6167e --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-missing-math.patch @@ -0,0 +1,20 @@ +--- setup.py.old 2009-07-03 11:34:59.141671252 +0200 ++++ setup.py 2009-07-03 11:51:54.415666711 +0200 +@@ -281,6 +281,8 @@ class pil_build_ext(build_ext): + if struct.unpack("h", "\0\1")[0] == 1: + defs.append(("WORDS_BIGENDIAN", None)) + ++ libs.append("m") ++ + exts = [(Extension( + "_imaging", files, libraries=libs, define_macros=defs + ))] +@@ -332,7 +334,7 @@ class pil_build_ext(build_ext): + )) + + if os.path.isfile("_imagingmath.c"): +- exts.append(Extension("_imagingmath", ["_imagingmath.c"])) ++ exts.append(Extension("_imagingmath", ["_imagingmath.c"], libraries=["m"])) + + self.extensions[:] = exts + diff --git a/dev-python/imaging/files/imaging-1.1.7-no-xv.patch b/dev-python/imaging/files/imaging-1.1.7-no-xv.patch new file mode 100644 index 00000000..1cbaf515 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-no-xv.patch @@ -0,0 +1,18 @@ +--- PIL/ImageShow.py.old 2009-11-30 10:28:37.000000000 +0100 ++++ PIL/ImageShow.py 2009-11-30 10:29:02.000000000 +0100 +@@ -149,13 +149,10 @@ + def get_command_ex(self, file, title=None, **options): + # note: xv is pretty outdated. most modern systems have + # imagemagick's display command instead. +- command = executable = "xv" +- if title: +- # FIXME: do full escaping +- command = command + " -name \"%s\"" % title ++ command = executable = "xdg-open" + return command, executable + +- if which("xv"): ++ if which("xdg-open"): + register(XVViewer) + + if __name__ == "__main__": 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 00000000..e087cd30 --- /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/files/imaging-1.1.7-sane.patch b/dev-python/imaging/files/imaging-1.1.7-sane.patch new file mode 100644 index 00000000..4970e500 --- /dev/null +++ b/dev-python/imaging/files/imaging-1.1.7-sane.patch @@ -0,0 +1,13 @@ +--- Imaging-1.1.6/Sane/_sane.c.orig 2006-12-03 13:12:22.000000000 +0100 ++++ Imaging-1.1.6/Sane/_sane.c 2009-02-28 11:41:19.000000000 +0200 +@@ -1152,8 +1152,8 @@ + static PyObject * + PySane_get_devices(PyObject *self, PyObject *args) + { +- SANE_Device **devlist; +- SANE_Device *dev; ++ const SANE_Device **devlist; ++ const SANE_Device *dev; + SANE_Status st; + PyObject *list; + int local_only, i; 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 00000000..7bc39514 --- /dev/null +++ b/dev-python/imaging/imaging-1.1.7-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2013 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 $ + +EAPI="3" +PYTHON_DEPEND="2" +PYTHON_USE_WITH="tk" +PYTHON_USE_WITH_OPT="tk" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" + +inherit eutils multilib 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="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" + +DEPEND="virtual/jpeg + media-libs/freetype:2 + lcms? ( media-libs/lcms:0 ) + scanner? ( media-gfx/sane-backends ) + X? ( x11-misc/xdg-utils )" +RDEPEND="${DEPEND}" +RDEPEND+=" !dev-python/pillow" + +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 +} diff --git a/dev-python/imaging/imaging-1.1.7-r2.ebuild b/dev-python/imaging/imaging-1.1.7-r2.ebuild new file mode 100644 index 00000000..c625b9e5 --- /dev/null +++ b/dev-python/imaging/imaging-1.1.7-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2013 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 $ + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE='tk?' + +inherit eutils multilib 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 lcms 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}" +RDEPEND+=" !dev-python/pillow" + +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" + ) + + use lcms || PATCHES+=( "${FILESDIR}/${P}-nolcms.patch" ) + + # 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 + + 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() { + local incdir=$(python_get_includedir) + insinto "${incdir#${EPREFIX}}" + doins libImaging/{Imaging.h,ImPlatform.h} + + wrap_phase distutils-r1_python_install +} + +python_install_all() { + use doc && local HTML_DOCS=( Docs/. ) + + distutils-r1_python_install_all + + if use scanner; then + docinto sane + dodoc Sane/{CHANGES,README,sanedoc.txt} + fi + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r Scripts/. + + if use scanner; then + insinto /usr/share/doc/${PF}/examples/sane + doins Sane/demo_*.py + fi + fi +} diff --git a/dev-python/imaging/imaging-1.1.7-r4.ebuild b/dev-python/imaging/imaging-1.1.7-r4.ebuild new file mode 100644 index 00000000..b3e8d5b5 --- /dev/null +++ b/dev-python/imaging/imaging-1.1.7-r4.ebuild @@ -0,0 +1,104 @@ +# 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.4 2014/07/30 01:21:21 vapier 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/metadata.xml b/dev-python/imaging/metadata.xml new file mode 100644 index 00000000..301d2207 --- /dev/null +++ b/dev-python/imaging/metadata.xml @@ -0,0 +1,5 @@ + + + + python + -- cgit v1.2.3