From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 27 Nov 2016 21:36:34 +0000 (-0500)
Subject: dev-python/pillow: don't install example scripts in /usr/bin
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=691a6ebb37a65aed9312539fc703884149660cfc;p=gentoo.git

dev-python/pillow: don't install example scripts in /usr/bin

We already install them in /usr/share/doc/${PF}/examples.
This resolves a file collision with dev-python/cgkit.

Bug: https://bugs.gentoo.org/600694

Package-Manager: portage-2.3.2_p11
---

diff --git a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
new file mode 100644
index 000000000000..a8aa0ecc0d0f
--- /dev/null
+++ b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 5257e748..410ce788 100644
+--- a/setup.py
++++ b/setup.py
+@@ -746,7 +746,6 @@ setup(name=NAME,
+       ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+       include_package_data=True,
+       packages=find_packages(),
+-      scripts=glob.glob("Scripts/*.py"),
+       test_suite='nose.collector',
+       keywords=["Imaging", ],
+       license='Standard PIL License',
diff --git a/dev-python/pillow/pillow-3.4.2.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
similarity index 97%
rename from dev-python/pillow/pillow-3.4.2.ebuild
rename to dev-python/pillow/pillow-3.4.2-r1.ebuild
index 80079f9e6210..c4ed8bcfde64 100644
--- a/dev-python/pillow/pillow-3.4.2.ebuild
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -48,6 +48,10 @@ S="${WORKDIR}/${MY_P}"
 # See _render and _clean in Tests/test_imagefont.py
 DISTUTILS_IN_SOURCE_BUILD=1
 
+PATCHES=(
+	"${FILESDIR}/pillow-3.4.2-no-scripts.patch"
+)
+
 python_prepare_all() {
 	# Disable all the stuff we don't want.
 	local f