Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/, dev-python/pillow/files/
Date: Sun, 27 Nov 2016 21:37:26
Message-Id: 1480282639.691a6ebb37a65aed9312539fc703884149660cfc.floppym@gentoo
1 commit: 691a6ebb37a65aed9312539fc703884149660cfc
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 27 21:36:34 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 27 21:37:19 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691a6ebb
7
8 dev-python/pillow: don't install example scripts in /usr/bin
9
10 We already install them in /usr/share/doc/${PF}/examples.
11 This resolves a file collision with dev-python/cgkit.
12
13 Bug: https://bugs.gentoo.org/600694
14
15 Package-Manager: portage-2.3.2_p11
16
17 dev-python/pillow/files/pillow-3.4.2-no-scripts.patch | 12 ++++++++++++
18 .../pillow/{pillow-3.4.2.ebuild => pillow-3.4.2-r1.ebuild} | 4 ++++
19 2 files changed, 16 insertions(+)
20
21 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
22 new file mode 100644
23 index 00000000..a8aa0ec
24 --- /dev/null
25 +++ b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
26 @@ -0,0 +1,12 @@
27 +diff --git a/setup.py b/setup.py
28 +index 5257e748..410ce788 100644
29 +--- a/setup.py
30 ++++ b/setup.py
31 +@@ -746,7 +746,6 @@ setup(name=NAME,
32 + ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
33 + include_package_data=True,
34 + packages=find_packages(),
35 +- scripts=glob.glob("Scripts/*.py"),
36 + test_suite='nose.collector',
37 + keywords=["Imaging", ],
38 + license='Standard PIL License',
39
40 diff --git a/dev-python/pillow/pillow-3.4.2.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
41 similarity index 97%
42 rename from dev-python/pillow/pillow-3.4.2.ebuild
43 rename to dev-python/pillow/pillow-3.4.2-r1.ebuild
44 index 80079f9..c4ed8bc 100644
45 --- a/dev-python/pillow/pillow-3.4.2.ebuild
46 +++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
47 @@ -48,6 +48,10 @@ S="${WORKDIR}/${MY_P}"
48 # See _render and _clean in Tests/test_imagefont.py
49 DISTUTILS_IN_SOURCE_BUILD=1
50
51 +PATCHES=(
52 + "${FILESDIR}/pillow-3.4.2-no-scripts.patch"
53 +)
54 +
55 python_prepare_all() {
56 # Disable all the stuff we don't want.
57 local f