diff --git a/dev-python/olefile-python2/Manifest b/dev-python/olefile-python2/Manifest
new file mode 100644
index 000000000..5da8dc58a
--- /dev/null
+++ b/dev-python/olefile-python2/Manifest
@@ -0,0 +1 @@
+DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
diff --git a/dev-python/olefile-python2/metadata.xml b/dev-python/olefile-python2/metadata.xml
new file mode 100644
index 000000000..f67f501f4
--- /dev/null
+++ b/dev-python/olefile-python2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">olefile</remote-id>
+    <remote-id type="github">python-imaging/Pillow</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/olefile-python2/olefile-python2-0.46.ebuild b/dev-python/olefile-python2/olefile-python2-0.46.ebuild
new file mode 100644
index 000000000..93ec39d8b
--- /dev/null
+++ b/dev-python/olefile-python2/olefile-python2-0.46.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=olefile
+MY_P=$MY_PN-$PV
+DESCRIPTION="Python package to parse, read and write Microsoft OLE2 files"
+HOMEPAGE="https://www.decalage.info/olefile"
+SRC_URI="https://github.com/decalage2/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="
+	!dev-python/${MY_PN}[python_targets_python2_7]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	rm -r ${D}/usr/share
+}
diff --git a/dev-python/pillow/pillow-6.2.2-r1.ebuild b/dev-python/pillow/pillow-6.2.2-r2.ebuild
similarity index 94%
rename from dev-python/pillow/pillow-6.2.2-r1.ebuild
rename to dev-python/pillow/pillow-6.2.2-r2.ebuild
index 4fa5337a2..8a1b77d71 100644
--- a/dev-python/pillow/pillow-6.2.2-r1.ebuild
+++ b/dev-python/pillow/pillow-6.2.2-r2.ebuild
@@ -21,11 +21,11 @@ SLOT="2.7"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	!dev-python/pillow:0[python_targets_python2_7]
-	dev-python/olefile[${PYTHON_USEDEP}]
+	dev-python/olefile-python2
 	imagequant? ( media-gfx/libimagequant:0 )
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:2= )
@@ -36,10 +36,6 @@ RDEPEND="
 	zlib? ( sys-libs/zlib:0= )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
 "
 
 distutils_enable_sphinx docs \