1 |
dev-zero 08/02/23 15:44:38 |
2 |
|
3 |
Modified: ChangeLog pyqwt-4.2-r1.ebuild pyqwt-5.0.1.ebuild |
4 |
Log: |
5 |
Fixed a couple of serious QA issues. |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.10 dev-python/pyqwt/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/ChangeLog?rev=1.10&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/ChangeLog?rev=1.10&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/ChangeLog?r1=1.9&r2=1.10 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v |
18 |
retrieving revision 1.9 |
19 |
retrieving revision 1.10 |
20 |
diff -u -r1.9 -r1.10 |
21 |
--- ChangeLog 23 Feb 2008 13:31:42 -0000 1.9 |
22 |
+++ ChangeLog 23 Feb 2008 15:44:37 -0000 1.10 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-python/pyqwt |
25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v 1.9 2008/02/23 13:31:42 dev-zero Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v 1.10 2008/02/23 15:44:37 dev-zero Exp $ |
28 |
+ |
29 |
+ 23 Feb 2008; Tiziano Müller <dev-zero@g.o> pyqwt-4.2-r1.ebuild, |
30 |
+ pyqwt-5.0.1.ebuild: |
31 |
+ Fixed a couple of serious QA issues. |
32 |
|
33 |
23 Feb 2008; Tiziano Müller <dev-zero@g.o> -pyqwt-4.2.ebuild: |
34 |
Dropped old revision. |
35 |
|
36 |
|
37 |
|
38 |
1.3 dev-python/pyqwt/pyqwt-4.2-r1.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/pyqwt-4.2-r1.ebuild?rev=1.3&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/pyqwt-4.2-r1.ebuild?rev=1.3&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/pyqwt-4.2-r1.ebuild?r1=1.2&r2=1.3 |
43 |
|
44 |
Index: pyqwt-4.2-r1.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-4.2-r1.ebuild,v |
47 |
retrieving revision 1.2 |
48 |
retrieving revision 1.3 |
49 |
diff -u -r1.2 -r1.3 |
50 |
--- pyqwt-4.2-r1.ebuild 11 Jul 2007 06:19:47 -0000 1.2 |
51 |
+++ pyqwt-4.2-r1.ebuild 23 Feb 2008 15:44:37 -0000 1.3 |
52 |
@@ -1,11 +1,13 @@ |
53 |
-# Copyright 1999-2007 Gentoo Foundation |
54 |
+# Copyright 1999-2008 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-4.2-r1.ebuild,v 1.2 2007/07/11 06:19:47 mr_bones_ Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-4.2-r1.ebuild,v 1.3 2008/02/23 15:44:37 dev-zero Exp $ |
58 |
|
59 |
-inherit distutils eutils |
60 |
+NEED_PYTHON="2.3" |
61 |
|
62 |
-MY_P=PyQwt-${PV} |
63 |
-S=${WORKDIR}/${MY_P} |
64 |
+inherit distutils eutils python |
65 |
+ |
66 |
+MY_P="PyQwt-${PV}" |
67 |
+S="${WORKDIR}/${MY_P}" |
68 |
|
69 |
DESCRIPTION="Python bindings for the Qwt library" |
70 |
SRC_URI="mirror://sourceforge/pyqwt/${MY_P}.tar.gz" |
71 |
@@ -16,31 +18,36 @@ |
72 |
KEYWORDS="~amd64 ~ia64 ~x86" |
73 |
IUSE="debug" |
74 |
|
75 |
-DEPEND=">=dev-lang/python-2.3.2 |
76 |
- ~x11-libs/qwt-4.2.0 |
77 |
+ |
78 |
+RDEPEND="~x11-libs/qwt-4.2.0 |
79 |
>=dev-python/PyQt-3.14 |
80 |
- >=dev-python/sip-4.2 |
81 |
>=dev-python/numarray-1.1.1 |
82 |
>=dev-python/numeric-23.7" |
83 |
+DEPEND="${RDEPEND} |
84 |
+ >=dev-python/sip-4.2" |
85 |
|
86 |
src_compile() { |
87 |
- cd ${S}/sip |
88 |
+ cd "${S}/sip" |
89 |
sed -i s/"[[:space:]]*const QLabel \*titleLabel() const\;"// qwtplot.sip |
90 |
sed -i s/"[[:space:]]*const QwtPlotCanvas \*canvas() const\;"// qwtplot.sip |
91 |
- cd ${S}/configure |
92 |
+ cd "${S}/configure" |
93 |
local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages -l /usr/$(get_libdir) \ |
94 |
-i /usr/include/qwt -v /usr/share/sip -x /usr/share/sip" |
95 |
use debug && myconf="${myconf} -u" |
96 |
has distcc ${FEATURES} || myconf="${myconf} -c" |
97 |
- python configure.py ${myconf} |
98 |
+ |
99 |
+ python_version |
100 |
+ "${python}" configure.py ${myconf} || die "python configure.py failed" |
101 |
emake || die "emake failed" |
102 |
} |
103 |
|
104 |
src_install() { |
105 |
- cd ${S} |
106 |
+ cd "${S}" |
107 |
sed -i s/2,4,9/2,5,9/ setup.py |
108 |
- python setup.py install --prefix=/usr --root=${D} || die "install failed" |
109 |
+ |
110 |
+ python_version |
111 |
+ "${python}" setup.py install --prefix=/usr --root="${D}" || die "install failed" |
112 |
dodoc ANNOUNCEMENT-4.2.TXT AUTHORS COPYING* README THANKS |
113 |
- use doc && mv ${D}/usr/share/doc/${MY_P}/* ${D}/usr/share/doc/${PF} |
114 |
- rm -rf ${D}/usr/share/doc/${MY_P} |
115 |
+ use doc && mv "${D}/usr/share/doc/${MY_P}"/* "${D}/usr/share/doc/${PF}" |
116 |
+ rm -rf "${D}/usr/share/doc/${MY_P}" |
117 |
} |
118 |
|
119 |
|
120 |
|
121 |
1.5 dev-python/pyqwt/pyqwt-5.0.1.ebuild |
122 |
|
123 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/pyqwt-5.0.1.ebuild?rev=1.5&view=markup |
124 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/pyqwt-5.0.1.ebuild?rev=1.5&content-type=text/plain |
125 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyqwt/pyqwt-5.0.1.ebuild?r1=1.4&r2=1.5 |
126 |
|
127 |
Index: pyqwt-5.0.1.ebuild |
128 |
=================================================================== |
129 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.0.1.ebuild,v |
130 |
retrieving revision 1.4 |
131 |
retrieving revision 1.5 |
132 |
diff -u -r1.4 -r1.5 |
133 |
--- pyqwt-5.0.1.ebuild 14 Jan 2008 19:19:27 -0000 1.4 |
134 |
+++ pyqwt-5.0.1.ebuild 23 Feb 2008 15:44:37 -0000 1.5 |
135 |
@@ -1,48 +1,66 @@ |
136 |
# Copyright 1999-2008 Gentoo Foundation |
137 |
# Distributed under the terms of the GNU General Public License v2 |
138 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.0.1.ebuild,v 1.4 2008/01/14 19:19:27 angelos Exp $ |
139 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.0.1.ebuild,v 1.5 2008/02/23 15:44:37 dev-zero Exp $ |
140 |
|
141 |
-inherit eutils |
142 |
+EAPI="1" |
143 |
+inherit eutils python toolchain-funcs |
144 |
|
145 |
-MY_P=PyQwt-${PV} |
146 |
-S=${WORKDIR}/${MY_P} |
147 |
+MY_P="PyQwt-${PV}" |
148 |
+S="${WORKDIR}/${MY_P}" |
149 |
|
150 |
DESCRIPTION="Python bindings for the Qwt library" |
151 |
SRC_URI="mirror://sourceforge/pyqwt/${MY_P}.tar.gz" |
152 |
HOMEPAGE="http://pyqwt.sourceforge.net/" |
153 |
- |
154 |
SLOT="5" |
155 |
LICENSE="GPL-2" |
156 |
KEYWORDS="~amd64 ~ia64 ~x86" |
157 |
IUSE="debug doc examples" |
158 |
|
159 |
-DEPEND="virtual/python |
160 |
- =x11-libs/qwt-5* |
161 |
+RDEPEND="virtual/python |
162 |
+ x11-libs/qwt:5 |
163 |
>=dev-python/PyQt4-4.2 |
164 |
- >=dev-python/sip-4.1.1 |
165 |
>=dev-python/numpy-1.0.1" |
166 |
+DEPEND="${DEPEND} |
167 |
+ >=dev-python/sip-4.1.1" |
168 |
+ |
169 |
+src_unpack() { |
170 |
+ unpack ${A} |
171 |
|
172 |
-src_compile() { |
173 |
- cd ${S}/sip/qwt5qt4 |
174 |
# PyQwt CVS does not need the next 2 sed statements anymore |
175 |
- sed -i "s|%Import QtSvg/QtSvgmod.sip||" QwtModule.sip |
176 |
- sed -i "s|%Include qwt_plot_svgitem.sip||" QwtModule.sip |
177 |
+ sed -i \ |
178 |
+ -e "s|%Import QtSvg/QtSvgmod.sip||" \ |
179 |
+ -e "s|%Include qwt_plot_svgitem.sip||" \ |
180 |
+ "${S}/sip/qwt5qt4/QwtModule.sip" || die "sed failed" |
181 |
+ |
182 |
+ # Avoid pre-stripped files |
183 |
+ sed -i \ |
184 |
+ -e 's|ModuleMakefile(|ModuleMakefile(strip=0,|' \ |
185 |
+ "${S}/configure/configure.py" || die "sed failed" |
186 |
+} |
187 |
+ |
188 |
+src_compile() { |
189 |
cd "${S}/configure" |
190 |
- local myconf="-I /usr/include/qwt5 -l qwt --disable-numarray --disable-numeric" |
191 |
+ |
192 |
+ local myconf="-I/usr/include/qwt5 -lqwt --disable-numarray --disable-numeric" |
193 |
use debug && myconf="${myconf} --debug" |
194 |
- has distcc ${FEATURES} || myconf="${myconf} -j 1" |
195 |
- python configure.py ${myconf} |
196 |
- emake || die "emake failed" |
197 |
+ has distcc ${FEATURES} || myconf="${myconf} -j1" |
198 |
+ |
199 |
+ python_version |
200 |
+ "${python}" configure.py ${myconf} || die "python configure.py failed" |
201 |
+ emake CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "emake failed" |
202 |
} |
203 |
|
204 |
src_install() { |
205 |
cd "${S}/configure" |
206 |
- make DESTDIR="${D}" install || die "make install failed" |
207 |
+ emake DESTDIR="${D}" install || die "make install failed" |
208 |
+ |
209 |
cd "${S}" |
210 |
dodoc ANNOUNCEMENT-${PV} CHANGES-${PV} COPYING* README |
211 |
- use doc && dohtml Doc/html/pyqwt/* |
212 |
- if use examples ; then |
213 |
- dodir /usr/share/doc/${PF}/examples |
214 |
- cp -r qt4examples/ "${D}/usr/share/doc/${PF}/examples" |
215 |
- fi |
216 |
+ |
217 |
+ use doc && dohtml Doc/html/pyqwt/* |
218 |
+ |
219 |
+ if use examples ; then |
220 |
+ dodir /usr/share/doc/${PF}/examples |
221 |
+ cp -r qt4examples/ "${D}/usr/share/doc/${PF}/examples" |
222 |
+ fi |
223 |
} |
224 |
|
225 |
|
226 |
|
227 |
-- |
228 |
gentoo-commits@l.g.o mailing list |