Drop dev-python/imaging from deps; portage seems to get confused by the || dep in some cases.

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

3 files changed, 31 insertions, 17 deletions

diff --git a/virtual/python-imaging/ChangeLog b/virtual/python-imaging/ChangeLog
index 48ea3f596dd5..2329c64d5ad3 100644
--- a/virtual/python-imaging/ChangeLog
+++ b/virtual/python-imaging/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for virtual/python-imaging
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-imaging/ChangeLog,v 1.4 2013/09/05 13:55:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-imaging/ChangeLog,v 1.5 2013/09/09 03:55:57 floppym Exp $
+
+*python-imaging-2 (09 Sep 2013)
+
+  09 Sep 2013; Mike Gilbert <floppym@gentoo.org> +python-imaging-2.ebuild:
+  Drop dev-python/imaging from deps; portage seems to get confused by the || dep
+  in some cases.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> python-imaging-1.ebuild:
   Drop stale conditionals after py2.5 removal.
diff --git a/virtual/python-imaging/Manifest b/virtual/python-imaging/Manifest
index acfcb7b22ecb..62ced2cc337b 100644
--- a/virtual/python-imaging/Manifest
+++ b/virtual/python-imaging/Manifest
@@ -3,24 +3,13 @@ Hash: SHA256
 
 EBUILD python-imaging-0.ebuild 545 SHA256 972240c7ec15500164c6515345af0fbbb6b4a44fc66f8e55fbd036d9a7135928 SHA512 6bc337f45e120bfb8331b2b960b06442e8952302459e1987f871895cf598932c28ef81f71575f3977df304d395e6004b1df7331278cd6cfac258652e0a962c01 WHIRLPOOL 8130212c354986c4368e9ba7fe46be2691628b321becfe9ef00d7c172e2771401a4c48719175eba091d150679e33b156ec18af800fe18ef6355d01698a8622c8
 EBUILD python-imaging-1.ebuild 1014 SHA256 ae1e87ec7945b154cacada6cfb2ae93e310f5fcfd754c71e6d124f4f4f6d002a SHA512 64e4a6d4f422f407e295f79f5a9fb9bb6a1eb4504ae90e11a0fe4cb352fb7af8aca08f1cc4fdf6bdffbeddca26721fceb4d561df2acd0fa4e85bde49089a2d75 WHIRLPOOL 1de8cfec7e92248817df29c53111650b41283a0a48b6092dbabac43dd99577eeada7d16b81d7748851ed552267244cefcb186a4c2b9be7195bc7c69398e1b263
-MISC ChangeLog 826 SHA256 e57eb60b80de2291e2e8ce7a80f1f7c8391c70a6d78fd46d0aca8629ffe20e96 SHA512 7abbad557d0de729bc78fa77b7d194198ea2776145411ca1ee6dde171f4861d477dee7b0d4f1c3cdbdafa8730cc6a54bbb054a0af485c02620388184b0f4f00c WHIRLPOOL d2014f83976f2d9f1364db37524739c790d766652477e15f5c733d6d4fc7b81759c6465c98acb1ede6aee7d247b4d6ca6d14fe37ff9a9a0ef28e57f3d4456187
+EBUILD python-imaging-2.ebuild 597 SHA256 c3d74a7f5b385b0a90970a73c2a5448202cf4f14f07a426b71bbd7ccff54900e SHA512 2f9d3abaf0599b9181fe7eda3fb263b557b7ac0327e1c86d792b7e615c102f77816f1bdb739ed9ac74cd31e53403b6bf5064ddcd92f389fe054db6a70914f54d WHIRLPOOL f3dd6cc910af1dc4831e48bfd9cb653034708e11f01efb981b709f745270786253273e6514816d450117cafa38b5f3ef58fb2a3f7c120275a74524ea0dcf8362
+MISC ChangeLog 1034 SHA256 ebc251826ed1bf0c0be0d1842a08343b9847f0f977ddc164f3e864dadd718fb8 SHA512 213d48681f2c008f559174c62d284d167b40b19cc74d9c65ef0681a141984f247ea07e909668a962ad20584613f3ffdec99936911e2f04473f030cab41fbf3f4 WHIRLPOOL 6e86a328c4a1bec2f371a93e0d2eaabf5881940e0ab6051dd613ea6c1e8cc2aa4cf6352f1e9a3c9f4f6e451d4907801159f05c023e644e10e2284d5d5adbcb32
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKI11XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6IMP/3eALBqIkXKgUL7DcxBSUXpW
-a0MSikuOWs+KbwT5ByHWRzQckqAUsaJYgZ48R9cMQSvvcdJP9vGx97QXSDoq4RaF
-jdCQKaDDYKRGZ9DiACRzo4MfD0CDl/s3H5jaIo1z2B6MZU3TJ+f5tRLCNDco5Udi
-KFBi+CWH063h0MzVgn3RSGN+5F4zPGItrX5cweyrBMazFLGGwpHIazSgrppO7U4P
-JagvfZKrv2Yyi9QXGSDNY3VjMYpy6sQ03LPwv1gaJYZFVRt71X1/OLbbU/LE80JQ
-CyoCIO0fVLUPtjp7CDGzhzelKxg6P/dQ+5YIyHZ1rCY+1OiWdHpPiGOZYh+b7gq6
-ZfxDZXwW7WI6NAEDgZb3KhoetnUjoekq0g8/oYcI3G3GE6kxRTAFXgQ9oJDFvDjB
-RF/i9zAoYGUtn66zf1hh/aKleM/VwQOtZusbrOBBDlvtJ1IkrR2cEA2eI2946BPm
-DLXD9214claMTLOqu1zW5PajtimWYlMESXPysWnkbSzqNWv2MooBMWwWJSl/k2JY
-1JgJAA2pZBvRBprcB5lVmLEhYIXvukLOQxIUTo9hvkOjILVyXpTBKQy7zL1Sekqh
-nkwc8vQ87DBN46KEknhx616ByksQHDT5ij8VDP3kslSIg3PXuK3reGFYbZ01oaAQ
-SbUr5/6d5y+rFfmLGd58
-=GnAQ
+iF4EAREIAAYFAlItRtEACgkQC77qH+pIQ6Tg7gEAv+N9oZJ50ku2PviLVKm/hN04
+2jscGavUd32Dbz/l8lIA/i/ObPvzxfmRwqhnYWZDKco6P/Qk3BvEWRsI7NoNj8df
+=wpxS
 -----END PGP SIGNATURE-----
diff --git a/virtual/python-imaging/python-imaging-2.ebuild b/virtual/python-imaging/python-imaging-2.ebuild
new file mode 100644
index 000000000000..5f0215a5a0a9
--- /dev/null
+++ b/virtual/python-imaging/python-imaging-2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-imaging/python-imaging-2.ebuild,v 1.1 2013/09/09 03:55:57 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit python-r1
+
+DESCRIPTION="Virtual for Python Imaging Library"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+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="tk"
+
+RDEPEND="dev-python/pillow[tk?,${PYTHON_USEDEP}]"