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: imaging-1.1.7.ebuild ChangeLog
Date: Sat, 30 Oct 2010 23:21:07
Message-Id: 20101030232101.47AD620051@flycatcher.gentoo.org
1 arfrever 10/10/30 23:21:01
2
3 Modified: imaging-1.1.7.ebuild ChangeLog
4 Log:
5 Update EAPI. Fix dependencies. Fix PYTHON_MODNAME.
6
7 (Portage version: 2.2.0_alpha2_p2/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.9 dev-python/imaging/imaging-1.1.7.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7.ebuild?rev=1.9&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7.ebuild?rev=1.9&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/imaging-1.1.7.ebuild?r1=1.8&r2=1.9
15
16 Index: imaging-1.1.7.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7.ebuild,v
19 retrieving revision 1.8
20 retrieving revision 1.9
21 diff -u -r1.8 -r1.9
22 --- imaging-1.1.7.ebuild 7 Mar 2010 12:51:07 -0000 1.8
23 +++ imaging-1.1.7.ebuild 30 Oct 2010 23:21:01 -0000 1.9
24 @@ -1,9 +1,13 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7.ebuild,v 1.8 2010/03/07 12:51:07 ssuominen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7.ebuild,v 1.9 2010/10/30 23:21:01 arfrever Exp $
29
30 -EAPI="2"
31 +EAPI="3"
32 +PYTHON_DEPEND="2"
33 +PYTHON_USE_WITH="tk"
34 +PYTHON_USE_WITH_OPT="tk"
35 SUPPORT_PYTHON_ABIS="1"
36 +RESTRICT_PYTHON_ABIS="3.*"
37
38 inherit eutils distutils
39
40 @@ -20,25 +24,32 @@
41
42 DEPEND="media-libs/jpeg:0
43 media-libs/freetype:2
44 - tk? ( dev-lang/python[tk?] )
45 scanner? ( media-gfx/sane-backends )
46 X? ( x11-misc/xdg-utils )"
47 RDEPEND="${DEPEND}"
48
49 -RESTRICT_PYTHON_ABIS="3*"
50 -
51 -PYTHON_MODNAME=PIL
52 S="${WORKDIR}/${MY_P}"
53
54 +DOCS="CHANGES CONTENTS"
55 +
56 +pkg_setup() {
57 + PYTHON_MODNAME="PIL $(use scanner && echo sane.py)"
58 + python_pkg_setup
59 +}
60 +
61 src_prepare() {
62 - epatch "${FILESDIR}"/${P}-no-xv.patch
63 - epatch "${FILESDIR}"/${P}-sane.patch
64 - epatch "${FILESDIR}"/${P}-giftrans.patch
65 - epatch "${FILESDIR}"/${P}-missing-math.patch
66 + distutils_src_prepare
67 +
68 + epatch "${FILESDIR}/${P}-no-xv.patch"
69 + epatch "${FILESDIR}/${P}-sane.patch"
70 + epatch "${FILESDIR}/${P}-giftrans.patch"
71 + epatch "${FILESDIR}/${P}-missing-math.patch"
72 +
73 sed -i \
74 -e "s:/usr/lib\":/usr/$(get_libdir)\":" \
75 -e "s:\"lib\":\"$(get_libdir)\":g" \
76 setup.py || die "sed failed"
77 +
78 if ! use tk; then
79 # Make the test always fail
80 sed -i \
81 @@ -49,9 +60,11 @@
82
83 src_compile() {
84 distutils_src_compile
85 +
86 if use scanner; then
87 - cd "${S}/Sane"
88 + pushd Sane > /dev/null
89 distutils_src_compile
90 + popd > /dev/null
91 fi
92 }
93
94 @@ -63,17 +76,17 @@
95 }
96
97 src_install() {
98 - local DOCS="CHANGES CONTENTS"
99 distutils_src_install
100
101 - use doc && dohtml Docs/*
102 + if use doc; then
103 + dohtml Docs/* || die "dohtml failed"
104 + fi
105
106 if use scanner; then
107 - cd "${S}/Sane"
108 + pushd Sane > /dev/null
109 docinto sane
110 - local DOCS="CHANGES sanedoc.txt"
111 - distutils_src_install
112 - cd "${S}"
113 + DOCS="CHANGES sanedoc.txt" distutils_src_install
114 + popd > /dev/null
115 fi
116
117 # Install headers required by media-gfx/sketch.
118 @@ -86,10 +99,11 @@
119
120 if use examples; then
121 insinto /usr/share/doc/${PF}/examples
122 - doins Scripts/*
123 + doins Scripts/* || die "doins failed"
124 +
125 if use scanner; then
126 insinto /usr/share/doc/${PF}/examples/sane
127 - doins Sane/demo_*.py
128 + doins Sane/demo_*.py || die "doins failed"
129 fi
130 fi
131 }
132
133
134
135 1.60 dev-python/imaging/ChangeLog
136
137 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.60&view=markup
138 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?rev=1.60&content-type=text/plain
139 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/imaging/ChangeLog?r1=1.59&r2=1.60
140
141 Index: ChangeLog
142 ===================================================================
143 RCS file: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v
144 retrieving revision 1.59
145 retrieving revision 1.60
146 diff -u -r1.59 -r1.60
147 --- ChangeLog 30 Oct 2010 23:06:27 -0000 1.59
148 +++ ChangeLog 30 Oct 2010 23:21:01 -0000 1.60
149 @@ -1,6 +1,10 @@
150 # ChangeLog for dev-python/imaging
151 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
152 -# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.59 2010/10/30 23:06:27 arfrever Exp $
153 +# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.60 2010/10/30 23:21:01 arfrever Exp $
154 +
155 + 30 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
156 + imaging-1.1.7.ebuild:
157 + Update EAPI. Fix dependencies. Fix PYTHON_MODNAME.
158
159 30 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
160 -imaging-1.1.6-r1.ebuild, -files/imaging-1.1.6-giftrans.patch,