Gentoo Archives: gentoo-commits

From: "Ali Polatel (hawking)" <hawking@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/qscintilla: qscintilla-1.7.1.ebuild ChangeLog qscintilla-2.1.ebuild
Date: Thu, 08 Nov 2007 15:04:17
Message-Id: E1Iq8vT-0001gd-6e@stork.gentoo.org
1 hawking 07/11/08 15:04:11
2
3 Modified: qscintilla-1.7.1.ebuild ChangeLog
4 qscintilla-2.1.ebuild
5 Log:
6 Fixed quoting
7 (Portage version: 2.1.3.18)
8
9 Revision Changes Path
10 1.10 dev-python/qscintilla/qscintilla-1.7.1.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.1.ebuild?rev=1.10&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.1.ebuild?rev=1.10&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.1.ebuild?r1=1.9&r2=1.10
15
16 Index: qscintilla-1.7.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.1.ebuild,v
19 retrieving revision 1.9
20 retrieving revision 1.10
21 diff -u -r1.9 -r1.10
22 --- qscintilla-1.7.1.ebuild 7 Nov 2007 17:46:02 -0000 1.9
23 +++ qscintilla-1.7.1.ebuild 8 Nov 2007 15:04:10 -0000 1.10
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2007 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.1.ebuild,v 1.9 2007/11/07 17:46:02 armin76 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.1.ebuild,v 1.10 2007/11/08 15:04:10 hawking Exp $
29
30 inherit eutils toolchain-funcs qt3
31
32 @@ -49,7 +49,7 @@
33 src_install() {
34 dodoc ChangeLog NEWS README*
35 dodir /usr/{include,$(get_libdir),share/qscintilla/translations}
36 - cd ${S}/qt
37 + cd "${S}"/qt
38 cp qextscintilla*.h "${D}/usr/include"
39 cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
40 cp lib/libqscintilla.a* "${D}/usr/$(get_libdir)"
41 @@ -59,11 +59,11 @@
42 dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
43 done
44 if use doc ; then
45 - dohtml ${S}/doc/html/*
46 + dohtml "${S}"/doc/html/*
47 insinto /usr/share/doc/${PF}/Scintilla
48 - doins ${S}/doc/Scintilla/*
49 + doins "${S}"/doc/Scintilla/*
50 fi
51 insinto ${QTDIR}/plugins/designer
52 insopts -m0755
53 - doins ${S}/designer/libqscintillaplugin.so
54 + doins "${S}"/designer/libqscintillaplugin.so
55 }
56
57
58
59 1.80 dev-python/qscintilla/ChangeLog
60
61 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?rev=1.80&view=markup
62 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?rev=1.80&content-type=text/plain
63 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/ChangeLog?r1=1.79&r2=1.80
64
65 Index: ChangeLog
66 ===================================================================
67 RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v
68 retrieving revision 1.79
69 retrieving revision 1.80
70 diff -u -r1.79 -r1.80
71 --- ChangeLog 7 Nov 2007 17:46:02 -0000 1.79
72 +++ ChangeLog 8 Nov 2007 15:04:10 -0000 1.80
73 @@ -1,6 +1,10 @@
74 # ChangeLog for dev-python/qscintilla
75 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
76 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.79 2007/11/07 17:46:02 armin76 Exp $
77 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.80 2007/11/08 15:04:10 hawking Exp $
78 +
79 + 08 Nov 2007; Ali Polatel <hawking@g.o> qscintilla-1.7.1.ebuild,
80 + qscintilla-2.1.ebuild:
81 + Fixed quoting.
82
83 07 Nov 2007; Raúl Porcel <armin76@g.o> qscintilla-1.7.1.ebuild,
84 qscintilla-2.1.ebuild:
85
86
87
88 1.4 dev-python/qscintilla/qscintilla-2.1.ebuild
89
90 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?rev=1.4&view=markup
91 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?rev=1.4&content-type=text/plain
92 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild?r1=1.3&r2=1.4
93
94 Index: qscintilla-2.1.ebuild
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild,v
97 retrieving revision 1.3
98 retrieving revision 1.4
99 diff -u -r1.3 -r1.4
100 --- qscintilla-2.1.ebuild 7 Nov 2007 17:46:02 -0000 1.3
101 +++ qscintilla-2.1.ebuild 8 Nov 2007 15:04:10 -0000 1.4
102 @@ -1,6 +1,6 @@
103 # Copyright 1999-2007 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild,v 1.3 2007/11/07 17:46:02 armin76 Exp $
106 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-2.1.ebuild,v 1.4 2007/11/08 15:04:10 hawking Exp $
107
108 inherit eutils toolchain-funcs python multilib
109
110 @@ -29,26 +29,26 @@
111 unpack ${A}
112
113 if use qt4; then
114 - cd ${S}/Qt4
115 + cd "${S}"/Qt4
116 sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" qscintilla.pro
117 sed -i -e "s:DESTDIR = \$\$\[QT_INSTALL_LIBS\]:DESTDIR = lib:" qscintilla.pro
118 echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
119 /usr/bin/qmake -o Makefile qscintilla.pro
120
121 - cd ${S}/designer-Qt4
122 - epatch ${FILESDIR}/${P}-qt4.patch
123 + cd "${S}"/designer-Qt4
124 + epatch "${FILESDIR}/${P}-qt4.patch"
125
126 echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> designer.pro
127 /usr/bin/qmake -o Makefile designer.pro
128 else
129 - cd ${S}/Qt3
130 + cd "${S}"/Qt3
131 sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" qscintilla.pro
132 sed -i -e "s:DESTDIR = \$\$\[QT_INSTALL_LIBS\]:DESTDIR = lib:" qscintilla.pro
133 echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
134 ${QTDIR}/bin/qmake -o Makefile qscintilla.pro
135
136 - cd ${S}/designer-Qt3
137 - epatch ${FILESDIR}/${P}-qt.patch
138 + cd "${S}"/designer-Qt3
139 + epatch "${FILESDIR}/${P}-qt.patch"
140
141 sed -i -e "s:DESTDIR = \$(QTDIR)/plugins/designer:DESTDIR = .:" designer.pro
142 echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> designer.pro
143 @@ -58,18 +58,18 @@
144
145 src_compile() {
146 if use qt4; then
147 - cd ${S}/Qt4
148 + cd "${S}"/Qt4
149 else
150 - cd ${S}/Qt3
151 + cd "${S}"/Qt3
152 fi
153 make all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed"
154
155 if use qt4; then
156 - cd ${S}/designer-Qt4
157 - make DESTDIR=${D}/usr/lib/qt4/plugins/designer || die "make failed"
158 + cd "${S}"/designer-Qt4
159 + make DESTDIR="${D}"/usr/lib/qt4/plugins/designer || die "make failed"
160 dodir /usr/lib/qt4/plugins/designer
161 if use python; then
162 - cd ${S}/Python
163 + cd "${S}"/Python
164 python_version
165 einfo "Creating bindings for python-${PYVER} ..."
166 local myconf="-d \
167 @@ -83,11 +83,11 @@
168 emake || die "emake failed"
169 fi
170 else
171 - cd ${S}/designer-Qt3
172 - make DESTDIR=${D}/${QTDIR}/plugins/designer || die "make failed"
173 + cd "${S}"/designer-Qt3
174 + make DESTDIR="${D}/${QTDIR}/plugins/designer" || die "make failed"
175 dodir ${QTDIR}/plugins/designer
176 if use python; then
177 - cd ${S}/Python
178 + cd "${S}"/Python
179 python_version
180 einfo "Creating bindings for python-${PYVER} ..."
181 local myconf="-d \
182 @@ -108,9 +108,9 @@
183 dodoc ChangeLog LICENSE NEWS README*
184 dodir /usr/{include,$(get_libdir),share/qscintilla/translations}
185 if use qt4; then
186 - cd ${S}/Qt4
187 + cd "${S}"/Qt4
188 else
189 - cd ${S}/Qt3
190 + cd "${S}"/Qt3
191 fi
192 cp -r Qsci "${D}/usr/include"
193 #cp qextscintilla*.h "${D}/usr/include"
194 @@ -129,21 +129,21 @@
195 done
196 fi
197 if use doc ; then
198 - dohtml ${S}/doc/html/*
199 + dohtml "${S}"/doc/html/*
200 insinto /usr/share/doc/${PF}/Scintilla
201 - doins ${S}/doc/Scintilla/*
202 + doins "${S}"/doc/Scintilla/*
203 fi
204 if use qt4; then
205 insinto /usr/$(get_libdir)/qt4/plugins/
206 insopts -m0755
207 - doins ${S}/designer-Qt4/libqscintillaplugin.so
208 + doins "${S}"/designer-Qt4/libqscintillaplugin.so
209 else
210 insinto ${QTDIR}/plugins/designer
211 insopts -m0755
212 - doins ${S}/designer-Qt3/libqscintillaplugin.so
213 + doins "${S}"/designer-Qt3/libqscintillaplugin.so
214 fi
215 if use python; then
216 - cd ${S}/Python
217 - make DESTDIR=${D} install || die "install failed"
218 + cd "${S}"/Python
219 + make DESTDIR="${D}" install || die "install failed"
220 fi
221 }
222
223
224
225 --
226 gentoo-commits@g.o mailing list