Remove imaging-2.0.0, add blocker for dev-python/pillow.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

8 files changed, 21 insertions, 335 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index c849bb573f33..cbeebc31615b 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.88 2013/05/28 22:34:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.89 2013/05/28 22:47:40 floppym Exp $
+
+  28 May 2013; Mike Gilbert <floppym@gentoo.org>
+  -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 <floppym@gentoo.org> imaging-2.0.0.ebuild:
   Depend on unzip.
diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest
index ae6f77e411d8..580e17c07485 100644
--- a/dev-python/imaging/Manifest
+++ b/dev-python/imaging/Manifest
@@ -6,20 +6,16 @@ AUX imaging-1.1.7-missing-math.patch 717 SHA256 9bce95374278416d183a7a5dd67de7d4
 AUX imaging-1.1.7-no-xv.patch 691 SHA256 d692f9085fefb06559ee63628852ce72a498657bccdd3ba500e8278ae22b145a SHA512 8a42a75a198ae9da4875e23fd26a834e5fb2209b1e6f67a99d6d14e02cd3ea5e1020d46c3a75df9442eea761de8f8e999551a1af45f2496b5f70fb3fafc80e5c WHIRLPOOL a1cced6e904e75b89abeb6d47b07dc2b33a43e3044d7f7243bd906647020ef42c588eb415f5e81344f5aede0dfa49a31405431d314a35cf37d43b5a7050280bf
 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
-AUX imaging-2.0.0-delete_hardcoded_paths.patch 7309 SHA256 400cb4029d59e6f80aea05051f10cedbb9937ce043ab764f8dfad845cfbabf72 SHA512 add72ba5df003162b29a0b034edc24bd18505ecd09ee80cc2ad7606a00e25f7918bf30bc1749961de341920c3b24743baffe16e6cf6060bf4a4fad6ca8b564ce WHIRLPOOL 43045044d725060c12cfe214154a27332756e5d0c4a9bae3ad792ca94d7107932cf61159af8bb3deaff9f5e104006f1fd28163a051b4465cc42d61d303c672a1
-AUX imaging-2.0.0-libm_linking.patch 598 SHA256 eea0a0d0edc0d4392ce6ef04d400f53cfee63d7093e4ee368ad491e5a5d2c872 SHA512 ab64b551e2782ab9537c826ea1237da4a38f897d14ee8d87e39e74108f6403ce20f86d133c09ef51b920b4395a9ef68af686b19b505174a5c6f6cf0c7e2d6572 WHIRLPOOL 921c536f7ea50c779bd2c93ed07c00c69116af16861ae30f2cd4010a524c2bd79711e1ad92ade0159ec25425bc8c5b4e6b65bdbef86d99cd47fd504e20106523
 DIST Imaging-1.1.7.tar.gz 498749 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 SHA512 fec2d39b4db3cb33cd7e7895aba4c3a8a5d4cff28decb9106c88e392cb848edf5593fcd77d11994bb16321837fdb26958787dac2c86d6f7c09996f466bac11f1 WHIRLPOOL e610b4097723f77de4c495537c64741ee4bd996f89d12e2e7853fb8f09028d02fa46920a86827f263eb6324a9063d2321ff865c80b7f8482b19f8143500575e8
-DIST Pillow-2.0.0.zip 1408539 SHA256 3e70c8f13675284166e4a8d8899107bf67febe676b893eb8d88785c24cca4c15 SHA512 8d87ba6b1cc60cf0c80d1a7222fa2ba309c8336fe1061aeb778562c70b2427b80e6d89fffcfe430d6da764e5f0c1ad55a3a03a8635cc305c98699b73ee10d32c WHIRLPOOL 409614ae169526db2f5beba49db362ea4f1ef73889f09e63fe8be8419a0893d6ea155b03cd0826549bb42777d1d49831fcc362a1889675e3a19e40a540fe1dd1
-EBUILD imaging-1.1.7-r1.ebuild 2692 SHA256 992c184566eccae6c69a667bdc5bb2623e9c1173bed86df308e4d97bd872037a SHA512 92bc5e80a340af4cff665253a14a0da1d57cc1b5c991634af3a4ed505f817c780dd5f662e2e6330d75b25ee6e5335699d0f46898a7876a59d3b237cd2445ab3b WHIRLPOOL 7038d0dc68d24fb73c51db6061713846c642242650ab02fff645b69f594440bf5368fa759bea04c4a470f7314ae4cd2735368c361d1a050dc8fe2432b1be044d
-EBUILD imaging-1.1.7-r2.ebuild 2355 SHA256 830994e7282c08d7066132766cafd5dc92252964959ed7fa9c291bea26a77d82 SHA512 8327814f1f664cd208b7069161e71b4e59d19c0427729f9f082a27be2375291598bbc39773e48a6b8175d08101e2011601691949ff81c4065fa9dd0a62a2e78d WHIRLPOOL 69019e0d7e04c3ab9d9efb80679e626d8be49188285bbefe80c35eb4852009928d257282c9b0cf129947754b93e7889fcf562986e7fd3ef75b2933cff9f5d4a5
-EBUILD imaging-1.1.7-r4.ebuild 2378 SHA256 aaaa8b76d3010dcd1cee8681e4e0a3bcdef8ff6f9b0f95459a42f0026763ef46 SHA512 b5329c6f3433f2b797db5b4dfcb2e430017c6a07752de76989fb97f75a339b189819ef883342b0559f9a8b7364c6ddbe540cff4877c27bfaa41e3f6a54e0f301 WHIRLPOOL c11a3294810df25c37e7a0c220cc9105c629026b648886ea6a40b6551569cd7773d66722c2e6086a50035024244bb65123096850afbcbdd8bb4d7d908ff9b7f7
-EBUILD imaging-2.0.0.ebuild 2993 SHA256 25c870d0d50e1d9bb50ea6c3060a28dfbcd0770dc2fdf18ef969cf3005d25fd4 SHA512 1e81cea8a257704bb3afad95a862cd08bbc43e918592acb755a9e112616c1fcef7855b5cd662ca3a0fe5538c49182dfd8095c0bd103611648e6239a1999001b8 WHIRLPOOL 9834fc9619c1943136a18dbd9bab12891c82e00e6e0f2f2fa5478e228d8458b42ad608363cc06c22fafdd25ae0497e86df876ef79c340addb9aa7f7d940d7512
-MISC ChangeLog 15158 SHA256 dd59a1e3ca2965be87a7435e6cd1e9f2f452a32c97b6a8c591023be9e93e5e84 SHA512 8c9bdcbedee9485cf63a091bd895f2575a095bb6d334a8759d5817f2233253b0b7286f1e41223a5ab9c2dc9e9d2209513c962e369108bd79e5a7bce78bf07074 WHIRLPOOL c95da7ff9fdba623c852f207f1e812b57315bc94a46e183279f80b04b3baa49c65b9d6fbded43f7b96b988d62e5a852f45e5cf8a15bafed564ea09d9da851d30
+EBUILD imaging-1.1.7-r1.ebuild 2721 SHA256 871fba0e3b0d4e46a46834a1623ce5354fd94fdbe13396d05da5d82c97fef47d SHA512 58c432ec574c6ca43ec6cd1042f542f774ab38a42bff469e714274b30ba6854a5a3a3b63cc714896623e6fa4d28edf8639aa0898da65d14ad2631944b9b46527 WHIRLPOOL 664d45effef8751a13f8bc0beea9961af964f4a62522d3dcd5a0c145c086a9a0c790dad27c354a329734a774ce3f61f967e19e156a7581d8fc4882bb9ad616d2
+EBUILD imaging-1.1.7-r2.ebuild 2390 SHA256 22bb71aee372ae472dbf3a6498a17e4282ae407cc4a771ce34038fd8201c7b22 SHA512 46abb9b9524ffffddec6d9caa98c85e35d682d792b3efe1f99c2b17ca54296933c5896a3f98b43402a89ef8d004a122db1f5e8c33dab15092b5a9d1744896457 WHIRLPOOL ea99716c82691a25235359f6a4411e30de8e8cd36faa2a354edc60d8792c9da74a91b5e7788c062ac47ee1e21a54c87ed3fffd128dbb1779c83e1d41a3448aa2
+EBUILD imaging-1.1.7-r4.ebuild 2409 SHA256 beb5dd411aab3b12f0882f7c63553712113eee4a60b3fa95ccbcc0586bfe2133 SHA512 6feefe3af8f0d23e35bca2b9eead0bf0f8f70402ef9517b0295f5b8492e3feb9f6296b9b91b85d0f4d875d0ffc725a85953de39bd3ccdfd23cb72ce3f108f655 WHIRLPOOL 8c91b03b9b7c5a224c084ae97281825f33cc8245fee540e31e28f43e0ce368aeae7af0bc5c7ded2e299636a0f19cbed1c5d5309e16a64cc567eb82076c876542
+MISC ChangeLog 15463 SHA256 60505a84637242670bf59bb0ae4176c32a6c115d8a861e8aaef05a3587a570c5 SHA512 dcedb9f2992805a0a6c5f79fba850130da6ee807a301ab114ccc41c6b074b6db020dcbb31369154bfb4578a5a7972580ab8ac2517cfbda7a2c14aea60272a37e WHIRLPOOL 4c9ec168b62ab7efdd04d3fd7255d2593a4b0c34e834161de779dba721547a85bfe091bbabc4dd44f1238d96be00080381650de95617777b458848e84a72171e
 MISC metadata.xml 240 SHA256 c074ff55f0a36445f041979a1f7ed66e1993313aad3d5a5e4f202dc842de7831 SHA512 837f01165c567829d1e8fab358907f8239042976a9f44a6cd0a7fd37070a8b5c275a2ddf836d9967c948c049927264eac917aae6093300258db319d5051c9769 WHIRLPOOL 4d7615634e94a9dd43de3945018123529c92576b4f0298500fa728204540f7ae1e8e618fa838ae34852f336a28771fc89a7bb3b18a7819ae3da061f1afdab1b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGlMQ8ACgkQC77qH+pIQ6Rg1wD8DycVGDuR6P2MDoLrjzlJFKuZ
-6FgHkpGU0PvZJLbJfysA/3oP4t/QfVQjZW6D+gYnlEvPr45dLpppzesZmTpwkTx9
-=TUqn
+iF4EAREIAAYFAlGlNA4ACgkQC77qH+pIQ6QrbAD6Ajb1jsGoF4SlexywlZutI+v5
+kvIQTFpl7V0XMFXF2UkBAMm+xw7mTySslxjvn/DaQFFWbrvpWm+wI/FiNvzRZExa
+=tzoM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/imaging/files/imaging-2.0.0-delete_hardcoded_paths.patch b/dev-python/imaging/files/imaging-2.0.0-delete_hardcoded_paths.patch
deleted file mode 100644
index ed5bdca65cb3..000000000000
--- a/dev-python/imaging/files/imaging-2.0.0-delete_hardcoded_paths.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -56,11 +56,6 @@
-     return None
- 
- 
--def _lib_include(root):
--    # map root to (root/lib, root/include)
--    return os.path.join(root, "lib"), os.path.join(root, "include")
--
--
- def _read(file):
-     return open(file, 'rb').read()
- 
-@@ -105,102 +100,17 @@
-             _add_directory(include_dirs, include_root)
- 
-         #
--        # add platform directories
--
--        if sys.platform == "cygwin":
--            # pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory
--            _add_directory(library_dirs, os.path.join(
--                "/usr/lib", "python%s" % sys.version[:3], "config"))
--
--        elif sys.platform == "darwin":
--            # attempt to make sure we pick freetype2 over other versions
--            _add_directory(include_dirs, "/sw/include/freetype2")
--            _add_directory(include_dirs, "/sw/lib/freetype2/include")
--            # fink installation directories
--            _add_directory(library_dirs, "/sw/lib")
--            _add_directory(include_dirs, "/sw/include")
--            # darwin ports installation directories
--            _add_directory(library_dirs, "/opt/local/lib")
--            _add_directory(include_dirs, "/opt/local/include")
--            # freetype2 ships with X11
--            _add_directory(library_dirs, "/usr/X11/lib")
--            _add_directory(include_dirs, "/usr/X11/include")
--
--        elif sys.platform.startswith("linux"):
--            for platform_ in (platform.processor(),platform.architecture()[0]):
--                if not platform_: continue
--
--                if platform_ in ["x86_64", "64bit"]:
--                    _add_directory(library_dirs, "/lib64")
--                    _add_directory(library_dirs, "/usr/lib64")
--                    _add_directory(library_dirs, "/usr/lib/x86_64-linux-gnu")
--                    break
--                elif platform_ in ["i386", "i686", "32bit"]:
--                    _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
--                    break
--            else:
--                raise ValueError("Unable to identify Linux platform: `%s`" % platform_)
--
--            # XXX Kludge. Above /\ we brute force support multiarch. Here we
--            # try Barry's more general approach. Afterward, something should
--            # work ;-)
--            self.add_multiarch_paths()
--
--        _add_directory(library_dirs, "/usr/local/lib")
--        # FIXME: check /opt/stuff directories here?
--
--        prefix = sysconfig.get_config_var("prefix")
--        if prefix:
--            _add_directory(library_dirs, os.path.join(prefix, "lib"))
--            _add_directory(include_dirs, os.path.join(prefix, "include"))
--
--        #
-         # locate tkinter libraries
- 
- 
-         if _tkinter:
-             TCL_VERSION = _tkinter.TCL_VERSION[:3]
- 
--        if _tkinter and not TCL_ROOT:
--            # we have Tkinter but the TCL_ROOT variable was not set;
--            # try to locate appropriate Tcl/Tk libraries
--            PYVERSION = sys.version[0] + sys.version[2]
--            TCLVERSION = TCL_VERSION[0] + TCL_VERSION[2]
--            roots = [
--                # common installation directories, mostly for Windows
--                # (for Unix-style platforms, we'll check in well-known
--                # locations later)
--                os.path.join("/py" + PYVERSION, "Tcl"),
--                os.path.join("/python" + PYVERSION, "Tcl"),
--                "/Tcl", "/Tcl" + TCLVERSION, "/Tcl" + TCL_VERSION,
--                os.path.join(os.environ.get("ProgramFiles", ""), "Tcl"),
--                ]
--            for TCL_ROOT in roots:
--                TCL_ROOT = os.path.abspath(TCL_ROOT)
--                if os.path.isfile(os.path.join(TCL_ROOT, "include", "tk.h")):
--                    # FIXME: use distutils logging (?)
--                    print("--- using Tcl/Tk libraries at", TCL_ROOT)
--                    print("--- using Tcl/Tk version", TCL_VERSION)
--                    TCL_ROOT = _lib_include(TCL_ROOT)
--                    break
--            else:
--                TCL_ROOT = None
--
- 
-         #
-         # add standard directories
- 
--        # look for tcl specific subdirectory (e.g debian)
--        if _tkinter:
--            tcl_dir = "/usr/include/tcl" + TCL_VERSION
--            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
--                _add_directory(include_dirs, tcl_dir)
--
-         # standard locations
--        _add_directory(library_dirs, "/usr/local/lib")
--        _add_directory(include_dirs, "/usr/local/include")
--
--        _add_directory(library_dirs, "/usr/lib")
-         _add_directory(include_dirs, "/usr/include")
- 
-         #
-@@ -333,28 +243,7 @@
-                 "_webp", ["_webp.c"], libraries=["webp"]))
- 
- 
--        if sys.platform == "darwin":
--            # locate Tcl/Tk frameworks
--            frameworks = []
--            framework_roots = [
--                "/Library/Frameworks",
--                "/System/Library/Frameworks"]
--            for root in framework_roots:
--                if (os.path.exists(os.path.join(root, "Tcl.framework")) and
--                    os.path.exists(os.path.join(root, "Tk.framework"))):
--                    print("--- using frameworks at %s" % root)
--                    frameworks = ["-framework", "Tcl", "-framework", "Tk"]
--                    dir = os.path.join(root, "Tcl.framework", "Headers")
--                    _add_directory(self.compiler.include_dirs, dir, 0)
--                    dir = os.path.join(root, "Tk.framework", "Headers")
--                    _add_directory(self.compiler.include_dirs, dir, 1)
--                    break
--            if frameworks:
--                exts.append(Extension(
--                    "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
--                    extra_compile_args=frameworks, extra_link_args=frameworks))
--                feature.tcl = feature.tk = 1  # mark as present
--        elif feature.tcl and feature.tk:
-+        if feature.tcl and feature.tk:
-             exts.append(Extension(
-                 "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-                 libraries=[feature.tcl, feature.tk]))
-@@ -445,30 +334,6 @@
-             if m.group(1) < "1.2.3":
-                 return m.group(1)
- 
--    # http://hg.python.org/users/barry/rev/7e8deab93d5a
--    def add_multiarch_paths(self):
--        # Debian/Ubuntu multiarch support.
--        # https://wiki.ubuntu.com/MultiarchSpec
--        # self.build_temp
--        tmpfile = os.path.join(self.build_temp, 'multiarch')
--        if not os.path.exists(self.build_temp):
--            os.makedirs(self.build_temp)
--        ret = os.system('dpkg-architecture -qDEB_HOST_MULTIARCH > %s' %
--                        tmpfile)
--        ret = os.system(
--            'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
--            tmpfile)
--        try:
--            if ret >> 8 == 0:
--                fp = open(tmpfile, 'r')
--                multiarch_path_component = fp.readline().strip()
--                _add_directory(self.compiler.library_dirs,
--                    '/usr/lib/' + multiarch_path_component)
--                _add_directory(self.compiler.include_dirs,
--                    '/usr/include/' + multiarch_path_component)
--        finally:
--            os.unlink(tmpfile)
--
- setup(
-     name=NAME,
-     version=VERSION,
diff --git a/dev-python/imaging/files/imaging-2.0.0-libm_linking.patch b/dev-python/imaging/files/imaging-2.0.0-libm_linking.patch
deleted file mode 100644
index 35d1df5a406b..000000000000
--- a/dev-python/imaging/files/imaging-2.0.0-libm_linking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -197,7 +197,7 @@
-         for file in _LIB_IMAGING:
-             files.append(os.path.join("libImaging", file + ".c"))
- 
--        libs = []
-+        libs = ["m"]
-         defs = []
-         if feature.jpeg:
-             libs.append(feature.jpeg)
-@@ -249,7 +249,7 @@
-                 libraries=[feature.tcl, feature.tk]))
- 
-         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/imaging-1.1.7-r1.ebuild b/dev-python/imaging/imaging-1.1.7-r1.ebuild
index ca501974a07f..7bc3951454be 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-2012 Gentoo Foundation
+# 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.12 2012/12/01 02:02:19 radhermit Exp $
+# $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"
@@ -28,6 +28,7 @@ DEPEND="virtual/jpeg
 	scanner? ( media-gfx/sane-backends )
 	X? ( x11-misc/xdg-utils )"
 RDEPEND="${DEPEND}"
+RDEPEND+=" !dev-python/pillow"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/imaging/imaging-1.1.7-r2.ebuild b/dev-python/imaging/imaging-1.1.7-r2.ebuild
index 51f1afa49e99..d20475dd9ced 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
 # 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.4 2013/02/24 12:15:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v 1.5 2013/05/28 22:47:40 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -25,6 +25,7 @@ DEPEND="virtual/jpeg
 	scanner? ( media-gfx/sane-backends )
 	X? ( x11-misc/xdg-utils )"
 RDEPEND="${DEPEND}"
+RDEPEND+=" !dev-python/pillow"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/imaging/imaging-1.1.7-r4.ebuild b/dev-python/imaging/imaging-1.1.7-r4.ebuild
index c7eaf21fbcd3..97fc718e7579 100644
--- a/dev-python/imaging/imaging-1.1.7-r4.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.1 2013/05/07 23:27:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.2 2013/05/28 22:47:40 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -28,6 +28,7 @@ RDEPEND="
 	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 )"
diff --git a/dev-python/imaging/imaging-2.0.0.ebuild b/dev-python/imaging/imaging-2.0.0.ebuild
deleted file mode 100644
index 77c9edbd9ec4..000000000000
--- a/dev-python/imaging/imaging-2.0.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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-2.0.0.ebuild,v 1.3 2013/05/28 22:34:54 floppym Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE='tk?'
-
-inherit distutils-r1 eutils
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-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 webp zlib"
-
-RDEPEND="
-	truetype? ( media-libs/freetype:2= )
-	jpeg? ( virtual/jpeg )
-	lcms? ( media-libs/lcms:0= )
-	scanner? ( media-gfx/sane-backends:0= )
-	tiff? ( media-libs/tiff:0= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )"
-
-# Tests don't handle missing jpeg, tiff & zlib properly.
-# https://github.com/python-imaging/Pillow/pull/199
-REQUIRED_USE="test? ( jpeg tiff zlib )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Tests like to write to cwd.
-	# https://github.com/python-imaging/Pillow/pull/200
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	# Apply patches before executing sed.
-	local patches=(
-		"${FILESDIR}/imaging-1.1.7-no-xv.patch"
-		"${FILESDIR}/imaging-2.0.0-delete_hardcoded_paths.patch"
-		"${FILESDIR}/imaging-2.0.0-libm_linking.patch"
-	)
-	epatch "${patches[@]}"
-
-	# Add shebangs.
-	# https://github.com/python-imaging/Pillow/pull/197
-	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 webp 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_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
-	"${PYTHON}" Tests/run.py --installed || 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/_build/. )
-	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
-		doins Sane/demo_*.py
-	fi
-}