Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/imaging: ChangeLog imaging-1.1.6-r1.ebuild
Date: Sat, 01 Aug 2009 23:04:46
Message-Id: E1MXNd6-0004pc-Ds@stork.gentoo.org
1 arfrever 09/08/01 23:04:44
2
3 Modified: ChangeLog imaging-1.1.6-r1.ebuild
4 Log:
5 Set SUPPORT_PYTHON_ABIS.
6 (Portage version: 13874-svn/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.43 dev-python/imaging/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.43&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.43&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/ChangeLog?r1=1.42&r2=1.43
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v
18 retrieving revision 1.42
19 retrieving revision 1.43
20 diff -u -r1.42 -r1.43
21 --- ChangeLog 15 Jul 2009 17:03:32 -0000 1.42
22 +++ ChangeLog 1 Aug 2009 23:04:44 -0000 1.43
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-python/imaging
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.42 2009/07/15 17:03:32 bicatali Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.43 2009/08/01 23:04:44 arfrever Exp $
28 +
29 + 01 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
30 + imaging-1.1.6-r1.ebuild:
31 + Set SUPPORT_PYTHON_ABIS.
32
33 15 Jul 2009; Sébastien Fabbro <bicatali@g.o>
34 files/imaging-1.1.6-tiffendian.patch:
35
36
37
38 1.4 dev-python/imaging/imaging-1.1.6-r1.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild?rev=1.4&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild?rev=1.4&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild?r1=1.3&r2=1.4
43
44 Index: imaging-1.1.6-r1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild,v
47 retrieving revision 1.3
48 retrieving revision 1.4
49 diff -u -r1.3 -r1.4
50 --- imaging-1.1.6-r1.ebuild 3 Jul 2009 09:57:58 -0000 1.3
51 +++ imaging-1.1.6-r1.ebuild 1 Aug 2009 23:04:44 -0000 1.4
52 @@ -1,8 +1,10 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild,v 1.3 2009/07/03 09:57:58 idl0r Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild,v 1.4 2009/08/01 23:04:44 arfrever Exp $
57 +
58 +EAPI="2"
59 +SUPPORT_PYTHON_ABIS="1"
60
61 -EAPI=2
62 inherit eutils distutils
63
64 MY_P=Imaging-${PV}
65 @@ -23,6 +25,8 @@
66 X? ( x11-misc/xdg-utils )"
67 RDEPEND="${DEPEND}"
68
69 +RESTRICT_PYTHON_ABIS="3*"
70 +
71 PYTHON_MODNAME=PIL
72 S="${WORKDIR}/${MY_P}"
73
74 @@ -36,7 +40,7 @@
75 -e "s:/usr/lib\":/usr/$(get_libdir)\":" \
76 -e "s:\"lib\":\"$(get_libdir)\":g" \
77 setup.py || die "sed failed"
78 - if ! use tk ; then
79 + if ! use tk; then
80 # Make the test always fail
81 sed -i \
82 -e 's/import _tkinter/raise ImportError/' \
83 @@ -46,15 +50,17 @@
84
85 src_compile() {
86 distutils_src_compile
87 - if use scanner ; then
88 + if use scanner; then
89 cd "${S}/Sane"
90 distutils_src_compile
91 fi
92 }
93
94 src_test() {
95 - find . -name _imaging\*.so | xargs -r cp -v -p --target-directory=./PIL/
96 - "${python}" selftest.py || die
97 + tests() {
98 + PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "${python}" selftest.py
99 + }
100 + python_execute_function tests
101 }
102
103 src_install() {
104 @@ -63,7 +69,7 @@
105
106 use doc && dohtml Docs/*
107
108 - if use scanner ; then
109 + if use scanner; then
110 cd "${S}/Sane"
111 docinto sane
112 local DOCS="CHANGES sanedoc.txt"
113 @@ -71,16 +77,18 @@
114 cd "${S}"
115 fi
116
117 - # install headers required by media-gfx/sketch
118 - distutils_python_version
119 - insinto /usr/include/python${PYVER}
120 - doins libImaging/Imaging.h
121 - doins libImaging/ImPlatform.h
122 + # Install headers required by media-gfx/sketch.
123 + install_headers() {
124 + insinto "$(python_get_includedir)"
125 + doins libImaging/Imaging.h
126 + doins libImaging/ImPlatform.h
127 + }
128 + python_execute_function install_headers
129
130 - if use examples ; then
131 + if use examples; then
132 insinto /usr/share/doc/${PF}/examples
133 doins Scripts/*
134 - if use scanner ; then
135 + if use scanner; then
136 insinto /usr/share/doc/${PF}/examples/sane
137 doins Sane/demo_*.py
138 fi