Convert from virtual/python-imaging to plain dev-python/pillow

Signed-off-by: Justin Lecher <jlec@gentoo.org>

119 files changed, 129 insertions, 123 deletions

diff --git a/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild b/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild
index e853118089f5..179897bff127 100644
--- a/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild
+++ b/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
 	media-gfx/zbar:0[python,gtk,imagemagick,${PYTHON_USEDEP}]
 	media-gfx/qrencode-python[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/app-misc/gourmet/gourmet-0.17.4.ebuild b/app-misc/gourmet/gourmet-0.17.4.ebuild
index e4b9f97e51a7..0957f8e8dc4d 100644
--- a/app-misc/gourmet/gourmet-0.17.4.ebuild
+++ b/app-misc/gourmet/gourmet-0.17.4.ebuild
@@ -19,7 +19,7 @@ IUSE="-i18n -ipython pdf print spell sound web"
 
 RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.7.9-r1[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	i18n? ( dev-python/elib-intl[${PYTHON_USEDEP}] )
 	ipython? ( >=dev-python/ipython-0.13.2[${PYTHON_USEDEP}] )
 	pdf? (
diff --git a/app-office/impressive/impressive-0.10.5.ebuild b/app-office/impressive/impressive-0.10.5.ebuild
index 56345d19a079..0c45da265fa6 100644
--- a/app-office/impressive/impressive-0.10.5.ebuild
+++ b/app-office/impressive/impressive-0.10.5.ebuild
@@ -23,7 +23,7 @@ DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	!>=dev-python/pillow-3.0.0
 	app-text/pdftk
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	x11-misc/xdg-utils
diff --git a/app-office/impressive/impressive-0.11.0b-r1.ebuild b/app-office/impressive/impressive-0.11.0b-r1.ebuild
index db4e6db429c0..04769335d4f6 100644
--- a/app-office/impressive/impressive-0.11.0b-r1.ebuild
+++ b/app-office/impressive/impressive-0.11.0b-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	app-text/pdftk
 	dev-python/pygame[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-apps/xrandr
 	|| (
 		app-text/mupdf
diff --git a/app-office/openerp/openerp-7.0.20140125.ebuild b/app-office/openerp/openerp-7.0.20140125.ebuild
index c9cf8926dfe5..78e2ec3182e2 100644
--- a/app-office/openerp/openerp-7.0.20140125.ebuild
+++ b/app-office/openerp/openerp-7.0.20140125.ebuild
@@ -51,7 +51,7 @@ CDEPEND="!app-office/openerp-web
 	dev-python/unittest2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	virtual/python-imaging[jpeg,${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	"
 
diff --git a/app-office/openerp/openerp-8.0.20140125.ebuild b/app-office/openerp/openerp-8.0.20140125.ebuild
index 1ccd2542cd4c..229e803c65e2 100644
--- a/app-office/openerp/openerp-8.0.20140125.ebuild
+++ b/app-office/openerp/openerp-8.0.20140125.ebuild
@@ -51,7 +51,7 @@ CDEPEND="!app-office/openerp-web
 	dev-python/unittest2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	virtual/python-imaging[jpeg,${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
 	${PYTHON_DEPS}
 	"
 
diff --git a/app-office/scribus/scribus-1.4.4-r1.ebuild b/app-office/scribus/scribus-1.4.4-r1.ebuild
index d0018a837152..0e6c5695d107 100644
--- a/app-office/scribus/scribus-1.4.4-r1.ebuild
+++ b/app-office/scribus/scribus-1.4.4-r1.ebuild
@@ -45,8 +45,8 @@ COMMON_DEPEND="
 	!cairo? ( media-libs/libart_lgpl )
 	hunspell? ( app-text/hunspell )
 	pdf? ( app-text/podofo )
-	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
index 1b16771608d6..246e7fc62f73 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -45,8 +45,8 @@ COMMON_DEPEND="
 	!cairo? ( media-libs/libart_lgpl )
 	hunspell? ( app-text/hunspell )
 	pdf? ( app-text/podofo )
-	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
index 6b5b6435123a..80f8a7796169 100644
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.0-r1.ebuild
@@ -62,8 +62,8 @@ COMMON_DEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo:0= )
-	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index eaddda0dd254..333a994df922 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -65,8 +65,8 @@ COMMON_DEPEND="
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo )
-	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
diff --git a/app-text/calibre/calibre-1.20.ebuild b/app-text/calibre/calibre-1.20.ebuild
index 7eb5fa02c2fa..dd219b049350 100644
--- a/app-text/calibre/calibre-1.20.ebuild
+++ b/app-text/calibre/calibre-1.20.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	>=dev-python/cssselect-0.7.1
 	>=dev-python/cssutils-0.9.9
 	>=dev-python/dbus-python-0.82.2
-	virtual/python-imaging
+	dev-python/pillow
 	>=dev-python/lxml-2.2.1
 	>=dev-python/mechanize-0.1.11
 	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
diff --git a/app-text/calibre/calibre-1.47.ebuild b/app-text/calibre/calibre-1.47.ebuild
index 6126c17ada0d..f1296bd3156c 100644
--- a/app-text/calibre/calibre-1.47.ebuild
+++ b/app-text/calibre/calibre-1.47.ebuild
@@ -61,7 +61,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	>=media-libs/libmtp-1.1.5:=
 	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
+	dev-python/pillow[python_targets_python2_7(-)]
 	>=x11-misc/xdg-utils-1.0.2-r2"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild
index c247c51e5a3d..9166fb203bc0 100644
--- a/app-text/calibre/calibre-1.48-r1.ebuild
+++ b/app-text/calibre/calibre-1.48-r1.ebuild
@@ -63,7 +63,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	>=media-libs/libmtp-1.1.5:=
 	virtual/libusb:1=
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=x11-misc/xdg-utils-1.0.2-r2"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/app-text/calibre/calibre-2.27.0.ebuild b/app-text/calibre/calibre-2.27.0.ebuild
index d2edbbbb5102..83f81cae45f3 100644
--- a/app-text/calibre/calibre-2.27.0.ebuild
+++ b/app-text/calibre/calibre-2.27.0.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	sys-libs/zlib
 	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
+	dev-python/pillow[python_targets_python2_7(-)]
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff --git a/app-text/calibre/calibre-2.31.0.ebuild b/app-text/calibre/calibre-2.31.0.ebuild
index d2edbbbb5102..83f81cae45f3 100644
--- a/app-text/calibre/calibre-2.31.0.ebuild
+++ b/app-text/calibre/calibre-2.31.0.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	sys-libs/zlib
 	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
+	dev-python/pillow[python_targets_python2_7(-)]
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff --git a/app-text/calibre/calibre-2.33.0.ebuild b/app-text/calibre/calibre-2.33.0.ebuild
index d2585c90a9e5..0e337a72ed40 100644
--- a/app-text/calibre/calibre-2.33.0.ebuild
+++ b/app-text/calibre/calibre-2.33.0.ebuild
@@ -64,7 +64,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	sys-libs/zlib
 	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
+	dev-python/pillow[python_targets_python2_7(-)]
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff --git a/app-text/calibre/calibre-2.34.0.ebuild b/app-text/calibre/calibre-2.34.0.ebuild
index d2585c90a9e5..0e337a72ed40 100644
--- a/app-text/calibre/calibre-2.34.0.ebuild
+++ b/app-text/calibre/calibre-2.34.0.ebuild
@@ -64,7 +64,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	sys-libs/zlib
 	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
+	dev-python/pillow[python_targets_python2_7(-)]
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff --git a/app-text/calibre/calibre-2.35.0-r1.ebuild b/app-text/calibre/calibre-2.35.0-r1.ebuild
index 8094919e3d76..0c31d15ea13f 100644
--- a/app-text/calibre/calibre-2.35.0-r1.ebuild
+++ b/app-text/calibre/calibre-2.35.0-r1.ebuild
@@ -64,7 +64,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	sys-libs/zlib
 	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
+	dev-python/pillow[python_targets_python2_7(-)]
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff --git a/app-text/calibre/calibre-2.35.0.ebuild b/app-text/calibre/calibre-2.35.0.ebuild
index 016c26c90f92..04d305e5f62d 100644
--- a/app-text/calibre/calibre-2.35.0.ebuild
+++ b/app-text/calibre/calibre-2.35.0.ebuild
@@ -67,7 +67,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	sys-libs/zlib
 	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
+	dev-python/pillow[python_targets_python2_7(-)]
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff --git a/app-text/paperwork/paperwork-0.2.3.ebuild b/app-text/paperwork/paperwork-0.2.3.ebuild
index c4e74de49516..f2e47caf7f89 100644
--- a/app-text/paperwork/paperwork-0.2.3.ebuild
+++ b/app-text/paperwork/paperwork-0.2.3.ebuild
@@ -30,6 +30,6 @@ RDEPEND="app-text/poppler[introspection]
 	dev-util/glade[introspection,python]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]"
 DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-0.2.4.ebuild b/app-text/paperwork/paperwork-0.2.4.ebuild
index e29dedb316da..2888a7a284e1 100644
--- a/app-text/paperwork/paperwork-0.2.4.ebuild
+++ b/app-text/paperwork/paperwork-0.2.4.ebuild
@@ -30,6 +30,6 @@ RDEPEND="app-text/poppler[introspection]
 	dev-util/glade[introspection,python]
 	sci-libs/scikits_learn[${PYTHON_USEDEP}]
 	sci-libs/scikits_image[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]"
 DEPEND="${RDEPEND}"
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
index 3aa768cda609..1cf93185477d 100644
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ b/app-text/pylize/pylize-1.3b-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-python/empy[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
diff --git a/dev-python/Djblets/Djblets-0.7.31.ebuild b/dev-python/Djblets/Djblets-0.7.31.ebuild
index c305a1ec9c3b..84b479f6ed61 100644
--- a/dev-python/Djblets/Djblets-0.7.31.ebuild
+++ b/dev-python/Djblets/Djblets-0.7.31.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 
 RDEPEND=">=dev-python/django-1.4.13[${PYTHON_USEDEP}]
 		=dev-python/django-1.4*[${PYTHON_USEDEP}]
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		>=dev-python/django-pipeline-1.2.24[${PYTHON_USEDEP}]
 		>=dev-python/feedparser-5.1.2[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Kivy/Kivy-1.9.0-r1.ebuild b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
index 8bd7347ca967..1ce542c72007 100644
--- a/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
+++ b/dev-python/Kivy/Kivy-1.9.0-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="cairo camera doc examples garden gstreamer spell"
 
 RDEPEND="
 	dev-python/pygame[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
 	camera? ( media-libs/opencv )
 	garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
diff --git a/dev-python/aplpy/aplpy-0.9.14.ebuild b/dev-python/aplpy/aplpy-0.9.14.ebuild
index c8f5e23de8f2..c4e72fd75d31 100644
--- a/dev-python/aplpy/aplpy-0.9.14.ebuild
+++ b/dev-python/aplpy/aplpy-0.9.14.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/pyavm[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MYP}
diff --git a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
index 13f5c95f0977..64e80cef8adc 100644
--- a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
+++ b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=dev-python/apptools-4[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/greenlet[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/cgkit/cgkit-2.0.0.ebuild b/dev-python/cgkit/cgkit-2.0.0.ebuild
index 39531919f98a..7062755cf0c5 100644
--- a/dev-python/cgkit/cgkit-2.0.0.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/pyprotocols[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	3ds? ( ~media-libs/lib3ds-1.3.0 )"
 DEPEND="${RDEPEND}
 	dev-util/scons"
diff --git a/dev-python/django/django-1.4.22.ebuild b/dev-python/django/django-1.4.22.ebuild
index e0c9dc697038..21dcb2760d51 100644
--- a/dev-python/django/django-1.4.22.ebuild
+++ b/dev-python/django/django-1.4.22.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		)"
 
 #		app-text/pytextile[${PYTHON_USEDEP}]
@@ -77,7 +77,7 @@ src_install() {
 	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	echo ""
 }
 
diff --git a/dev-python/django/django-1.5.12.ebuild b/dev-python/django/django-1.5.12.ebuild
index 47d2191ae722..aa6df6d9fda7 100644
--- a/dev-python/django/django-1.5.12.ebuild
+++ b/dev-python/django/django-1.5.12.ebuild
@@ -22,7 +22,7 @@ IUSE="doc mysql postgres sqlite test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
 PY23_USEDEP=$(python_gen_usedep python2_7 'python{3_3,3_4}')
-RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
 	postgres? ( dev-python/psycopg:2[${PY23_USEDEP}] )
 	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
 DEPEND="${RDEPEND}
diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
index fc8df50693a6..96362e838bff 100644
--- a/dev-python/django/django-1.6.11.ebuild
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -80,7 +80,7 @@ src_install() {
 	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	echo ""
 }
 
diff --git a/dev-python/django/django-1.7.10.ebuild b/dev-python/django/django-1.7.10.ebuild
index 19ae2b5de9c5..694c3ffdc6a0 100644
--- a/dev-python/django/django-1.7.10.ebuild
+++ b/dev-python/django/django-1.7.10.ebuild
@@ -79,7 +79,7 @@ src_install() {
 	optfeature "PostgreSQL backend support" dev-python/psycopg:2
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	echo ""
 }
 
diff --git a/dev-python/django/django-1.8.5.ebuild b/dev-python/django/django-1.8.5.ebuild
index 915004919505..e547d53ef732 100644
--- a/dev-python/django/django-1.8.5.ebuild
+++ b/dev-python/django/django-1.8.5.ebuild
@@ -96,7 +96,7 @@ pkg_postinst() {
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
 	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
 	echo ""
diff --git a/dev-python/django/django-1.8.6.ebuild b/dev-python/django/django-1.8.6.ebuild
index 4a89c4345e22..52ddc5bf5f02 100644
--- a/dev-python/django/django-1.8.6.ebuild
+++ b/dev-python/django/django-1.8.6.ebuild
@@ -96,7 +96,7 @@ pkg_postinst() {
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
 	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
 	echo ""
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index f2d393f28f9b..c0a392e35541 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -77,7 +77,7 @@ src_install() {
 	elog "Other features can be enhanced by"
 	optfeature "GEO Django" sci-libs/gdal[geos]
 	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
+	optfeature "ImageField Support" dev-python/pillow
 	optfeature "Password encryption" dev-python/bcrypt
 	optfeature "Extended templating support" dev-python/jinja
 	echo ""
diff --git a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
index b8d864814e2e..929f4c2334f2 100644
--- a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
+++ b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ia64 ppc x86"
 IUSE="doc"
 
 DEPEND="${PYTHON_DEPS}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
index dd94ce0423c3..ff16bc55bdf4 100644
--- a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
+++ b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND=">=dev-python/axiom-0.6.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/cssutils-0.9.10-r1[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/nevow-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]
diff --git a/dev-python/mantissa/mantissa-0.8.0.ebuild b/dev-python/mantissa/mantissa-0.8.0.ebuild
index 98ef1ecca4ac..7f716a648e36 100644
--- a/dev-python/mantissa/mantissa-0.8.0.ebuild
+++ b/dev-python/mantissa/mantissa-0.8.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	>=dev-python/axiom-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/cssutils-0.9.5[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/nevow-0.9.5[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
 	>=dev-python/twisted-core-14.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mantissa/mantissa-0.8.1.ebuild b/dev-python/mantissa/mantissa-0.8.1.ebuild
index 296f013ae235..4a957d7881eb 100644
--- a/dev-python/mantissa/mantissa-0.8.1.ebuild
+++ b/dev-python/mantissa/mantissa-0.8.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	>=dev-python/axiom-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/cssutils-0.9.5[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/nevow-0.9.5[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
 	>=dev-python/twisted-core-14.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-1.4.2.ebuild b/dev-python/matplotlib/matplotlib-1.4.2.ebuild
index adc42560851d..b09070184f08 100644
--- a/dev-python/matplotlib/matplotlib-1.4.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.2.ebuild
@@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-text/dvipng
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PY2_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
index ed25b875f7bb..8c1aed948cf0 100644
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -60,7 +60,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-text/dvipng
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
index 444bf6f91830..b32275d0116b 100644
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
@@ -62,7 +62,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-text/dvipng
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/mock[${PY2_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index 9830282d1da2..1bde41e63e17 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -62,7 +62,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-text/dvipng
-		virtual/python-imaging[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
diff --git a/dev-python/pyds/pyds-0.7.3-r1.ebuild b/dev-python/pyds/pyds-0.7.3-r1.ebuild
index dbca1ca205c4..6eed12289cb1 100644
--- a/dev-python/pyds/pyds-0.7.3-r1.ebuild
+++ b/dev-python/pyds/pyds-0.7.3-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="app-text/silvercity
 	>=dev-db/metakit-2.4.9.2[python,${PYTHON_USEDEP}]
 	>=dev-python/cheetah-0.9.15[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.3[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/medusa-0.5.4[${PYTHON_USEDEP}]
 	>=dev-python/pyrex-0.5[${PYTHON_USEDEP}]
 	>=dev-python/soappy-0.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyinsane/pyinsane-1.3.8.ebuild b/dev-python/pyinsane/pyinsane-1.3.8.ebuild
index c842c5baa1a9..6ace85058f4b 100644
--- a/dev-python/pyinsane/pyinsane-1.3.8.ebuild
+++ b/dev-python/pyinsane/pyinsane-1.3.8.ebuild
@@ -16,5 +16,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="media-gfx/sane-backends
-	virtual/python-imaging"
+	dev-python/pillow"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyocr/pyocr-0.2.4.ebuild b/dev-python/pyocr/pyocr-0.2.4.ebuild
index 53f9463043da..527bb2f07127 100644
--- a/dev-python/pyocr/pyocr-0.2.4.ebuild
+++ b/dev-python/pyocr/pyocr-0.2.4.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="cuneiform? ( app-text/cuneiform )
 	tesseract? ( app-text/tesseract )
-	virtual/python-imaging"
+	dev-python/pillow"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyocr/pyocr-0.3.0.ebuild b/dev-python/pyocr/pyocr-0.3.0.ebuild
index 6f9516e3ef54..2d5af6b376f0 100644
--- a/dev-python/pyocr/pyocr-0.3.0.ebuild
+++ b/dev-python/pyocr/pyocr-0.3.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="cuneiform? ( app-text/cuneiform )
 	tesseract? ( app-text/tesseract )
-	virtual/python-imaging"
+	dev-python/pillow"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/reportlab/reportlab-2.6.ebuild b/dev-python/reportlab/reportlab-2.6.ebuild
index 1606664c3ebe..ce3458b7edaf 100644
--- a/dev-python/reportlab/reportlab-2.6.ebuild
+++ b/dev-python/reportlab/reportlab-2.6.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
-RDEPEND="virtual/python-imaging
+RDEPEND="dev-python/pillow
 	media-fonts/ttf-bitstream-vera
 	media-libs/libart_lgpl
 	sys-libs/zlib"
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
index 1b244e064bd1..54061afdf693 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="svg"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pdfrw[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
diff --git a/dev-python/scrapy/scrapy-1.0.1.ebuild b/dev-python/scrapy/scrapy-1.0.1.ebuild
index 89bac41c945d..f379e6096d6a 100644
--- a/dev-python/scrapy/scrapy-1.0.1.ebuild
+++ b/dev-python/scrapy/scrapy-1.0.1.ebuild
@@ -20,7 +20,7 @@ IUSE="boto doc ibl test ssl"
 
 RDEPEND=">=dev-python/six-1.5.2[${PYTHON_USEDEP}]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
diff --git a/dev-python/scrapy/scrapy-1.0.3.ebuild b/dev-python/scrapy/scrapy-1.0.3.ebuild
index 21f1be088b97..1dcb0a46c4d3 100644
--- a/dev-python/scrapy/scrapy-1.0.3.ebuild
+++ b/dev-python/scrapy/scrapy-1.0.3.ebuild
@@ -21,7 +21,7 @@ IUSE="boto doc ibl test ssl"
 RDEPEND="
 	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild
index 56988ebb3d8b..25d47d6b0cbf 100644
--- a/dev-python/simplecv/simplecv-1.3.ebuild
+++ b/dev-python/simplecv/simplecv-1.3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
 	shell? ( dev-python/ipython[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
index d8f3224526b1..b7b19c290839 100644
--- a/dev-python/soya/soya-0.14-r1.ebuild
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	>=media-libs/libsdl-1.2.8[opengl]
 	media-libs/openal
 	virtual/opengl
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/sympy/sympy-0.7.4.1.ebuild b/dev-python/sympy/sympy-0.7.4.1.ebuild
index ef012857b714..cc01bc99487f 100644
--- a/dev-python/sympy/sympy-0.7.4.1.ebuild
+++ b/dev-python/sympy/sympy-0.7.4.1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
-	imaging? ( virtual/python-imaging[${PYTHON_USEDEP}] )
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
 	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
 	latex? (
 		virtual/latex-base
diff --git a/dev-python/sympy/sympy-0.7.6.ebuild b/dev-python/sympy/sympy-0.7.6.ebuild
index cc93a001175d..109b43f222df 100644
--- a/dev-python/sympy/sympy-0.7.6.ebuild
+++ b/dev-python/sympy/sympy-0.7.6.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
-	imaging? ( virtual/python-imaging[${PYTHON_USEDEP}] )
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
 	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
 	latex? (
 		virtual/latex-base
diff --git a/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild b/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild
index 286d332a0779..dfa7812d8c11 100644
--- a/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild
+++ b/dev-python/xhtml2pdf/xhtml2pdf-0.0.5-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/html5lib[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pyPdf[${PYTHON_USEDEP}]
 	dev-python/reportlab[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/xhtml2pdf/xhtml2pdf-0.0.6-r1.ebuild b/dev-python/xhtml2pdf/xhtml2pdf-0.0.6-r1.ebuild
index 5c218e4b631a..80dde8eafcd8 100644
--- a/dev-python/xhtml2pdf/xhtml2pdf-0.0.6-r1.ebuild
+++ b/dev-python/xhtml2pdf/xhtml2pdf-0.0.6-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="dev-python/html5lib[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/PyPDF2[${PYTHON_USEDEP}]
 	>=dev-python/reportlab-2.2[${PYTHON_USEDEP}]
 	<dev-python/reportlab-3[${PYTHON_USEDEP}]"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
index 869e633fccd7..9299b50fc936 100644
--- a/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
+++ b/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-python/pymongo[${PYTHON_USEDEP}]
-	|| ( dev-python/imaging[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] )
+	dev-python/pillow[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
index 869e633fccd7..9299b50fc936 100644
--- a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
+++ b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-python/pymongo[${PYTHON_USEDEP}]
-	|| ( dev-python/imaging[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] )
+	dev-python/pillow[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.3.12.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.3.12.ebuild
index f59a8065dde6..a07401e9fe63 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.3.12.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.3.12.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-ros/rosbag[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
index f59a8065dde6..a07401e9fe63 100644
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-9999.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-ros/rosbag[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
diff --git a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
index 43adba507192..0840a019355d 100644
--- a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/pyatspi[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gdk-pixbuf:2[introspection]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/libwnck:3[introspection]
diff --git a/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild b/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
index 6aff604ce3a3..7213a1e50578 100644
--- a/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
@@ -98,7 +98,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyinotify[${PYTHON_USEDEP}]
 	dev-python/pypam[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 
 	x11-themes/gnome-themes-standard[gtk]
 	x11-themes/gnome-icon-theme-symbolic
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
index 25c500bfc3c2..8cbf5cf54007 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
@@ -105,7 +105,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyinotify[python_targets_python2_7]
 	dev-python/pypam[python_targets_python2_7]
-	virtual/python-imaging[python_targets_python2_7]
+	dev-python/pillow[python_targets_python2_7]
 
 	x11-themes/gnome-themes-standard[gtk]
 	x11-themes/gnome-icon-theme-symbolic
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
index 76f706b0a8ea..48dab268ac8f 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
@@ -105,7 +105,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyinotify[python_targets_python2_7]
 	dev-python/pypam[python_targets_python2_7]
-	virtual/python-imaging[python_targets_python2_7]
+	dev-python/pillow[python_targets_python2_7]
 
 	x11-themes/gnome-themes-standard[gtk]
 	x11-themes/gnome-icon-theme-symbolic
diff --git a/media-gfx/asymptote/asymptote-2.32.ebuild b/media-gfx/asymptote/asymptote-2.32.ebuild
index 034b46c0f481..fcbf4ba0a8ce 100644
--- a/media-gfx/asymptote/asymptote-2.32.ebuild
+++ b/media-gfx/asymptote/asymptote-2.32.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	X? (
 		${PYTHON_DEPS}
 		x11-misc/xdg-utils
-		virtual/python-imaging[tk,${PYTHON_USEDEP}]
+		dev-python/pillow[tk,${PYTHON_USEDEP}]
 		)
 	latex? (
 		virtual/latex-base
diff --git a/media-gfx/comix/comix-4.0.4-r1.ebuild b/media-gfx/comix/comix-4.0.4-r1.ebuild
index 6cc76181ef6d..574046149933 100644
--- a/media-gfx/comix/comix-4.0.4-r1.ebuild
+++ b/media-gfx/comix/comix-4.0.4-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="rar"
 
 DEPEND="${PYTHON_DEPS}
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	rar? ( || ( app-arch/unrar app-arch/rar ) )"
diff --git a/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild b/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild
index 40548f2b2b92..d942d5245540 100644
--- a/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild
+++ b/media-gfx/cropgui/cropgui-0.1.1-r3.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${PYTHON_DEPS}
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
 "
diff --git a/media-gfx/mcomix/mcomix-1.00-r1.ebuild b/media-gfx/mcomix/mcomix-1.00-r1.ebuild
index b1ca4fa54d6d..303312b62975 100644
--- a/media-gfx/mcomix/mcomix-1.00-r1.ebuild
+++ b/media-gfx/mcomix/mcomix-1.00-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	>=dev-python/pygtk-2.14[${PYTHON_USEDEP}]
 	virtual/jpeg
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gdk-pixbuf
 	!media-gfx/comix"
 
diff --git a/media-gfx/mcomix/mcomix-1.01.ebuild b/media-gfx/mcomix/mcomix-1.01.ebuild
index 1dfcd26042ea..e2a27e7f474f 100644
--- a/media-gfx/mcomix/mcomix-1.01.ebuild
+++ b/media-gfx/mcomix/mcomix-1.01.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	>=dev-python/pygtk-2.14[${PYTHON_USEDEP}]
 	virtual/jpeg
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-libs/gdk-pixbuf
 	!media-gfx/comix"
 
diff --git a/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild b/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild
index c8d53da7d96b..e1e0c6143532 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.01-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="Apache-2.0"
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	media-gfx/qrencode"
 DEPEND="${RDEPEND}"
 
diff --git a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
index 162bddd8841b..f82634eeadd7 100644
--- a/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
+++ b/media-gfx/qrencode-python/qrencode-python-1.02_pre140921.ebuild
@@ -19,6 +19,6 @@ LICENSE="Apache-2.0"
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	media-gfx/qrencode"
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild b/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
index 2111a7b9aa00..fa2dcf7496f3 100644
--- a/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
+++ b/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 IUSE="nls"
 
-DEPEND="virtual/python-imaging
+DEPEND="dev-python/pillow
 	dev-python/pyxml
 	dev-python/reportlab
 	dev-lang/tk
diff --git a/media-gfx/skencil/skencil-1.0_alpha784.ebuild b/media-gfx/skencil/skencil-1.0_alpha784.ebuild
index ca387d0baa23..1d15643dd74e 100644
--- a/media-gfx/skencil/skencil-1.0_alpha784.ebuild
+++ b/media-gfx/skencil/skencil-1.0_alpha784.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/python-imaging
+DEPEND="dev-python/pillow
 	dev-python/pyxml
 	dev-python/reportlab
 	dev-lang/tk
diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
index 4123b05a9763..c41c97664191 100644
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
+++ b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	media-gfx/imagemagick
 	media-libs/lcms:2
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	app-text/ghostscript-gpl"
diff --git a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
index 99f5858663ad..ac217b1644de 100644
--- a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
@@ -36,7 +36,7 @@ DEPEND="!media-plugins/mytharchive
 	=media-tv/mythtv-${PV}*:=[python]
 	mytharchive? (
 		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
+		dev-python/pillow:=
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
index 249a75c8c01b..740b4872f5a3 100644
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
@@ -75,7 +75,7 @@ DEPEND="!media-plugins/mytharchive
 	mythzoneminder? ( virtual/mysql )
 	mytharchive? (
 		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
+		dev-python/pillow:=
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
index 9048a2d40ccb..07d40ccdb5c6 100644
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
@@ -75,7 +75,7 @@ DEPEND="!media-plugins/mytharchive
 	mythzoneminder? ( virtual/mysql )
 	mytharchive? (
 		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
+		dev-python/pillow:=
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
diff --git a/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild b/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
index 26587fc5c784..d0311739a21a 100644
--- a/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
@@ -36,7 +36,7 @@ DEPEND="!media-plugins/mytharchive
 	=media-tv/mythtv-${PV}*:=[python]
 	mytharchive? (
 		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
+		dev-python/pillow:=
 		media-video/dvdauthor
 		media-video/mjpegtools[png]
 		media-video/transcode
diff --git a/media-radio/wspr/wspr-2.00-r2.ebuild b/media-radio/wspr/wspr-2.00-r2.ebuild
index 8bb695f1a1d5..819c7f26103f 100644
--- a/media-radio/wspr/wspr-2.00-r2.ebuild
+++ b/media-radio/wspr/wspr-2.00-r2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
+	dev-python/pillow[tk,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
diff --git a/media-radio/wspr/wspr-3.01-r1.ebuild b/media-radio/wspr/wspr-3.01-r1.ebuild
index b53cc7014c81..222df7a966e7 100644
--- a/media-radio/wspr/wspr-3.01-r1.ebuild
+++ b/media-radio/wspr/wspr-3.01-r1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
+	dev-python/pillow[tk,${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
 	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
diff --git a/media-radio/wspr/wspr-3.01.ebuild b/media-radio/wspr/wspr-3.01.ebuild
index 33e302e2933c..bb0906d80a93 100644
--- a/media-radio/wspr/wspr-3.01.ebuild
+++ b/media-radio/wspr/wspr-3.01.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
+	dev-python/pillow[tk,${PYTHON_USEDEP}]
 	<dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
 	virtual/python-pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
diff --git a/media-sound/puddletag/puddletag-1.0.5.ebuild b/media-sound/puddletag/puddletag-1.0.5.ebuild
index f165a6c5ee0c..06947bc0776b 100644
--- a/media-sound/puddletag/puddletag-1.0.5.ebuild
+++ b/media-sound/puddletag/puddletag-1.0.5.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=dev-python/PyQt4-4.9.6-r2[${PYTHON_USEDEP},svg]
 	>=dev-python/configobj-4.7.2-r1[${PYTHON_USEDEP}]
 	acoustid? ( >=media-libs/chromaprint-0.6 )
 	musicbrainz? ( >=dev-python/python-musicbrainz-0.7.4-r1[${PYTHON_USEDEP}] )
-	cover? ( virtual/python-imaging[${PYTHON_USEDEP}] )
+	cover? ( dev-python/pillow[${PYTHON_USEDEP}] )
 	quodlibet? ( >=media-sound/quodlibet-2.5[${PYTHON_USEDEP}] )
 	>=dev-python/sip-4.14.2-r1:0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.0.1[${PYTHON_USEDEP}]"
diff --git a/media-tv/freevo/freevo-1.9.0-r1.ebuild b/media-tv/freevo/freevo-1.9.0-r1.ebuild
index d1ebc6f0b9ba..be474ee37d78 100644
--- a/media-tv/freevo/freevo-1.9.0-r1.ebuild
+++ b/media-tv/freevo/freevo-1.9.0-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer n
 
 RDEPEND="
 	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
 	>=dev-python/twisted-core-2.5[${PYTHON_USEDEP}]
 	>=dev-python/twisted-web-0.6[${PYTHON_USEDEP}]
diff --git a/media-tv/freevo/freevo-1.9.0.ebuild b/media-tv/freevo/freevo-1.9.0.ebuild
index 1a7a780b616f..2f86be8c019c 100644
--- a/media-tv/freevo/freevo-1.9.0.ebuild
+++ b/media-tv/freevo/freevo-1.9.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X"
 
 RDEPEND="dev-python/beautifulsoup:python-2
-	virtual/python-imaging
+	dev-python/pillow
 	dev-python/pygame
 	>=dev-python/twisted-core-2.5
 	>=dev-python/twisted-web-0.6
diff --git a/media-video/flumotion/flumotion-0.10.1.ebuild b/media-video/flumotion/flumotion-0.10.1.ebuild
index a6bcdd14a3c7..fdf5aba3fedc 100644
--- a/media-video/flumotion/flumotion-0.10.1.ebuild
+++ b/media-video/flumotion/flumotion-0.10.1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # media-plugins/gst-plugins-libpng:0.10
 # dev-python/twisted-web
 # dev-python/twisted-names
-# dev-python/imaging
+# dev-python/pillow
 
 # These are from README
 RDEPEND="${PYTHON_DEPS}
diff --git a/media-video/flumotion/flumotion-0.8.1-r1.ebuild b/media-video/flumotion/flumotion-0.8.1-r1.ebuild
index e87d695ce3ae..fc8c86e85bee 100644
--- a/media-video/flumotion/flumotion-0.8.1-r1.ebuild
+++ b/media-video/flumotion/flumotion-0.8.1-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # media-plugins/gst-plugins-libpng:0.10
 # dev-python/twisted-web
 # dev-python/twisted-names
-# dev-python/imaging
+# dev-python/pillow
 
 # These are from README
 RDEPEND="${PYTHON_DEPS}
diff --git a/media-video/flumotion/flumotion-0.8.1.ebuild b/media-video/flumotion/flumotion-0.8.1.ebuild
index 6724950daf32..2e284dfa5d70 100644
--- a/media-video/flumotion/flumotion-0.8.1.ebuild
+++ b/media-video/flumotion/flumotion-0.8.1.ebuild
@@ -23,7 +23,7 @@ IUSE="doc test"
 # media-plugins/gst-plugins-libpng:0.10
 # dev-python/twisted-web
 # dev-python/twisted-names
-# dev-python/imaging
+# dev-python/pillow
 
 # These are from README
 RDEPEND="dev-python/gst-python:0.10
diff --git a/media-video/griffith/griffith-0.13-r1.ebuild b/media-video/griffith/griffith-0.13-r1.ebuild
index 756596acd6c3..8f0d5ff216c3 100644
--- a/media-video/griffith/griffith-0.13-r1.ebuild
+++ b/media-video/griffith/griffith-0.13-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND="virtual/python-imaging
+RDEPEND="dev-python/pillow
 	gnome-base/libglade
 	dev-python/pyxml[${PYTHON_USEDEP}]
 	>=dev-python/pygtk-2.6.1:2[${PYTHON_USEDEP}]
diff --git a/media-video/griffith/griffith-0.13.ebuild b/media-video/griffith/griffith-0.13.ebuild
index 116ee406fbc9..2ecd0a2a2956 100644
--- a/media-video/griffith/griffith-0.13.ebuild
+++ b/media-video/griffith/griffith-0.13.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND="virtual/python-imaging
+RDEPEND="dev-python/pillow
 	gnome-base/libglade
 	dev-python/pyxml
 	>=dev-python/pygtk-2.6.1:2
diff --git a/media-video/openshot/openshot-1.4.3.ebuild b/media-video/openshot/openshot-1.4.3.ebuild
index 0a8587867991..dd9aee7c6487 100644
--- a/media-video/openshot/openshot-1.4.3.ebuild
+++ b/media-video/openshot/openshot-1.4.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/pygoocanvas[${PYTHON_USEDEP}]
 	dev-python/pygtk[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	>=media-libs/mlt-0.8.2[ffmpeg,frei0r,gtk,melt,python,sdl,xml]
 	ffmpeg? (
 		libav? ( media-video/libav:=[encode,sdl,x264,mp3,theora] )
diff --git a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
index efd1a2265827..933ed5e13f15 100644
--- a/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-1.9.91-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="cairo sdl"
 
 RDEPEND="dev-python/wxpython:2.8[cairo?,${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	media-video/mplayer[encode]
 	sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )"
 
diff --git a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
index cd30eaef9b92..0d4c6dbf6faa 100644
--- a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
+++ b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	dev-python/twisted-words[${PYTHON_USEDEP}]
 	dev-python/twisted-web[${PYTHON_USEDEP}]
 	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-python26-warnings.patch"
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
index f2a558433d2f..d5fd4070f9f2 100644
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r4.ebuild
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 	dev-python/twisted-words[${PYTHON_USEDEP}]
 	dev-python/twisted-web[${PYTHON_USEDEP}]
 	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-python26-warnings.diff"
diff --git a/net-print/hplip/hplip-3.14.10.ebuild b/net-print/hplip/hplip-3.14.10.ebuild
index 7103046d3ffc..d8228548a83a 100644
--- a/net-print/hplip/hplip-3.14.10.ebuild
+++ b/net-print/hplip/hplip-3.14.10.ebuild
@@ -57,7 +57,7 @@ RDEPEND="${COMMON_DEPEND}
 		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
 		scanner? (
 			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=virtual/python-imaging-1[${PYTHON_USEDEP}]
+			>=dev-python/pillow-1[${PYTHON_USEDEP}]
 			X? ( || (
 				kde? ( kde-misc/skanlite )
 				media-gfx/xsane
diff --git a/net-print/hplip/hplip-3.15.9.ebuild b/net-print/hplip/hplip-3.15.9.ebuild
index a32038422202..2f50312985ef 100644
--- a/net-print/hplip/hplip-3.15.9.ebuild
+++ b/net-print/hplip/hplip-3.15.9.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${COMMON_DEPEND}
 		kernel_linux? ( virtual/udev )
 		scanner? (
 			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=virtual/python-imaging-1[${PYTHON_USEDEP}]
+			>=dev-python/pillow-1[${PYTHON_USEDEP}]
 			X? ( || (
 				kde? ( kde-misc/skanlite )
 				media-gfx/xsane
diff --git a/net-print/pkpgcounter/pkpgcounter-3.50-r1.ebuild b/net-print/pkpgcounter/pkpgcounter-3.50-r1.ebuild
index b4c30589eddc..528b1a81549e 100644
--- a/net-print/pkpgcounter/pkpgcounter-3.50-r1.ebuild
+++ b/net-print/pkpgcounter/pkpgcounter-3.50-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="virtual/python-imaging"
+DEPEND="dev-python/pillow"
 RDEPEND="${DEPEND}"
 
 DOCS="BUGS CREDITS NEWS README PKG-INFO"
diff --git a/profiles/package.mask b/profiles/package.mask
index ac87a0039cad..a55b15c0b371 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
+# Compatibility virtual for transition from
+# dev-python/imaging to dev-python/pillow
+# obsolete now #508266
+virtual/python-imaging
+
 # Lars Wendler <polynomial-c@gentoo.org> (10 Nov 2015)
 # Masked apache-2.4.17 due to broken REDIRECT_URL
 # behavior. See Gentoo bug #565348 for more details.
diff --git a/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild b/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
index 9aa40748d29d..3ad9eb5b1aa8 100644
--- a/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
+++ b/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND="x11-libs/gtk+:2
 	dev-python/pygtk[${PYTHON_USEDEP}]
 	dev-python/pygobject[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/mapcatcher-${PV}
diff --git a/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
index b06e82a84d7f..f3219afee290 100644
--- a/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
+++ b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/python-imaging
+RDEPEND="dev-python/pillow
 	dev-python/paste"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
diff --git a/sci-libs/scipy/scipy-0.15.1.ebuild b/sci-libs/scipy/scipy-0.15.1.ebuild
index 4ff3d432a8b7..f2da4ab3d2a2 100644
--- a/sci-libs/scipy/scipy-0.15.1.ebuild
+++ b/sci-libs/scipy/scipy-0.15.1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${CDEPEND}
 	"
 
 RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt THANKS.txt )
 
diff --git a/sci-libs/scipy/scipy-0.16.0.ebuild b/sci-libs/scipy/scipy-0.16.0.ebuild
index 515846246970..2546eb4ad0a7 100644
--- a/sci-libs/scipy/scipy-0.16.0.ebuild
+++ b/sci-libs/scipy/scipy-0.16.0.ebuild
@@ -39,7 +39,7 @@ DEPEND="${CDEPEND}
 	"
 
 RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt THANKS.txt )
 
diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild
index 07d973074f97..9780b433c2ad 100644
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${CDEPEND}
 	"
 
 RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt THANKS.txt )
 
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
index 43f0f3e41f3f..283cf57c9d34 100644
--- a/sci-libs/scipy/scipy-9999.ebuild
+++ b/sci-libs/scipy/scipy-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="${CDEPEND}
 	"
 
 RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt THANKS.txt )
 
diff --git a/www-apps/curator/curator-3.0_p20110120.ebuild b/www-apps/curator/curator-3.0_p20110120.ebuild
index 90364c096417..daf35b64942c 100644
--- a/www-apps/curator/curator-3.0_p20110120.ebuild
+++ b/www-apps/curator/curator-3.0_p20110120.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	virtual/python-imaging
+	dev-python/pillow
 	|| ( >=media-gfx/imagemagick-5.4.9 media-gfx/graphicsmagick[imagemagick] )"
 
 S="${WORKDIR}/curator-3.0_pf078f1686a78"
diff --git a/www-apps/nikola/nikola-7.2.0.ebuild b/www-apps/nikola/nikola-7.2.0.ebuild
index bae5e7c07b84..ac8e32f67ae7 100644
--- a/www-apps/nikola/nikola-7.2.0.ebuild
+++ b/www-apps/nikola/nikola-7.2.0.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.10.423[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( >=dev-python/pygal-1.5.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.6.0.ebuild b/www-apps/nikola/nikola-7.6.0.ebuild
index 1b6e82aff553..42904721bdfa 100644
--- a/www-apps/nikola/nikola-7.6.0.ebuild
+++ b/www-apps/nikola/nikola-7.6.0.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	~dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-1.7.0[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.6.1.ebuild b/www-apps/nikola/nikola-7.6.1.ebuild
index 50962d6ff80d..98f2e6d7bc91 100644
--- a/www-apps/nikola/nikola-7.6.1.ebuild
+++ b/www-apps/nikola/nikola-7.6.1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-1.7.0[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.6.2.ebuild b/www-apps/nikola/nikola-7.6.2.ebuild
index da055ef03e27..a8e68e7459dd 100644
--- a/www-apps/nikola/nikola-7.6.2.ebuild
+++ b/www-apps/nikola/nikola-7.6.2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-2.0.0[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
diff --git a/www-apps/nikola/nikola-7.6.3.ebuild b/www-apps/nikola/nikola-7.6.3.ebuild
index 290993c38942..beec964f7c93 100644
--- a/www-apps/nikola/nikola-7.6.3.ebuild
+++ b/www-apps/nikola/nikola-7.6.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
 	charts? ( ~dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
diff --git a/www-client/weboob/weboob-0g.ebuild b/www-client/weboob/weboob-0g.ebuild
index 6da2649115ae..cec0c1b2c55e 100644
--- a/www-client/weboob/weboob-0g.ebuild
+++ b/www-client/weboob/weboob-0g.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	dev-python/mechanize[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
diff --git a/www-client/weboob/weboob-0h.ebuild b/www-client/weboob/weboob-0h.ebuild
index 90fd7e99a287..ebacde66b075 100644
--- a/www-client/weboob/weboob-0h.ebuild
+++ b/www-client/weboob/weboob-0h.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	dev-python/mechanize[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
diff --git a/www-client/weboob/weboob-9998.ebuild b/www-client/weboob/weboob-9998.ebuild
index 6da2649115ae..cec0c1b2c55e 100644
--- a/www-client/weboob/weboob-9998.ebuild
+++ b/www-client/weboob/weboob-9998.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	dev-python/mechanize[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
diff --git a/www-client/weboob/weboob-9999.ebuild b/www-client/weboob/weboob-9999.ebuild
index 6da2649115ae..cec0c1b2c55e 100644
--- a/www-client/weboob/weboob-9999.ebuild
+++ b/www-client/weboob/weboob-9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 	dev-python/mechanize[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/gdata[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
diff --git a/x11-misc/outwiker/outwiker-1.8.0.ebuild b/x11-misc/outwiker/outwiker-1.8.0.ebuild
index a7610870a498..013cb1c906f8 100644
--- a/x11-misc/outwiker/outwiker-1.8.0.ebuild
+++ b/x11-misc/outwiker/outwiker-1.8.0.ebuild
@@ -18,7 +18,7 @@ DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	dev-python/pywebkitgtk[${PYTHON_USEDEP}]
 	dev-python/wxpython[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 "
diff --git a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
index cec3bfbe16da..532a6440b17f 100644
--- a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
+++ b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="dev-python/gst-python:0.10[${PYTHON_USEDEP}]
 	dev-python/twisted-core
 	dev-python/twisted-conch
 	media-gfx/xloadimage
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-misc/devilspie"
 DEPEND=""
 
diff --git a/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild b/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild
index 9ca2ae0d7f3e..a5acaab1a1ad 100644
--- a/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild
+++ b/x11-plugins/desklet-ImageSlideShow/desklet-ImageSlideShow-0.8-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="${RDEPEND} virtual/python-imaging"
+RDEPEND="${RDEPEND} dev-python/pillow"
 DOCS="MANIFEST README"
 
 src_prepare() {
diff --git a/x11-wm/xpra/xpra-0.14.27.ebuild b/x11-wm/xpra/xpra-0.14.27.ebuild
index 4d8014c65d61..253cac722458 100644
--- a/x11-wm/xpra/xpra-0.14.27.ebuild
+++ b/x11-wm/xpra/xpra-0.14.27.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
diff --git a/x11-wm/xpra/xpra-0.15.6.ebuild b/x11-wm/xpra/xpra-0.15.6.ebuild
index b1ee9e0ad02d..9a5f115048e1 100644
--- a/x11-wm/xpra/xpra-0.15.6.ebuild
+++ b/x11-wm/xpra/xpra-0.15.6.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/rencode[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
diff --git a/x11-wm/xpra/xpra-0.15.7.ebuild b/x11-wm/xpra/xpra-0.15.7.ebuild
index 9e66d3b62697..c5ca308f940b 100644
--- a/x11-wm/xpra/xpra-0.15.7.ebuild
+++ b/x11-wm/xpra/xpra-0.15.7.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/rencode[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap