Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qwt: qwt-6.0.1.ebuild qwt-6.0.1-r1.ebuild ChangeLog qwt-6.0.0.ebuild
Date: Fri, 31 Aug 2012 06:51:54
Message-Id: 20120831065131.7185720D43@flycatcher.gentoo.org
1 jlec 12/08/31 06:51:31
2
3 Modified: qwt-6.0.1.ebuild ChangeLog qwt-6.0.0.ebuild
4 Added: qwt-6.0.1-r1.ebuild
5 Log:
6 x11-libs/qwt: Fix svg support, #421559
7
8 (Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.3 x11-libs/qwt/qwt-6.0.1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild?r1=1.2&r2=1.3
16
17 Index: qwt-6.0.1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- qwt-6.0.1.ebuild 21 Dec 2011 15:45:53 -0000 1.2
24 +++ qwt-6.0.1.ebuild 31 Aug 2012 06:51:31 -0000 1.3
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2011 Gentoo Foundation
27 +# Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild,v 1.2 2011/12/21 15:45:53 jlec Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1.ebuild,v 1.3 2012/08/31 06:51:31 jlec Exp $
31
32 EAPI=4
33
34 @@ -67,7 +67,7 @@
35 -e 's:libqwt:libqwt6:g' \
36 -i qwtbuild.pri || die
37
38 - use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg"
39 + use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
40 cp *.pri examples/ || die
41 }
42
43
44
45
46 1.102 x11-libs/qwt/ChangeLog
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.102&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.102&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?r1=1.101&r2=1.102
51
52 Index: ChangeLog
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v
55 retrieving revision 1.101
56 retrieving revision 1.102
57 diff -u -r1.101 -r1.102
58 --- ChangeLog 4 Mar 2012 07:33:44 -0000 1.101
59 +++ ChangeLog 31 Aug 2012 06:51:31 -0000 1.102
60 @@ -1,6 +1,12 @@
61 # ChangeLog for x11-libs/qwt
62 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
63 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.101 2012/03/04 07:33:44 jlec Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.102 2012/08/31 06:51:31 jlec Exp $
65 +
66 +*qwt-6.0.1-r1 (31 Aug 2012)
67 +
68 + 31 Aug 2012; Justin Lecher <jlec@g.o> qwt-6.0.0.ebuild,
69 + qwt-6.0.1.ebuild, +qwt-6.0.1-r1.ebuild:
70 + Fix svg support, #421559
71
72 04 Mar 2012; Justin Lecher <jlec@g.o> -qwt-5.2.0.ebuild, metadata.xml:
73 Clean old
74
75
76
77 1.9 x11-libs/qwt/qwt-6.0.0.ebuild
78
79 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild?rev=1.9&view=markup
80 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild?rev=1.9&content-type=text/plain
81 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild?r1=1.8&r2=1.9
82
83 Index: qwt-6.0.0.ebuild
84 ===================================================================
85 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild,v
86 retrieving revision 1.8
87 retrieving revision 1.9
88 diff -u -r1.8 -r1.9
89 --- qwt-6.0.0.ebuild 3 Mar 2012 15:56:35 -0000 1.8
90 +++ qwt-6.0.0.ebuild 31 Aug 2012 06:51:31 -0000 1.9
91 @@ -1,6 +1,6 @@
92 # Copyright 1999-2012 Gentoo Foundation
93 # Distributed under the terms of the GNU General Public License v2
94 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild,v 1.8 2012/03/03 15:56:35 ranger Exp $
95 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.0.ebuild,v 1.9 2012/08/31 06:51:31 jlec Exp $
96
97 EAPI=4
98
99 @@ -67,7 +67,7 @@
100 -e 's:libqwt:libqwt6:g' \
101 -i qwtbuild.pri || die
102
103 - use svg && echo >> qwtconfig.pri "CONFIG += QwtSvg"
104 + use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
105 cp *.pri examples/ || die
106 }
107
108
109
110
111 1.1 x11-libs/qwt/qwt-6.0.1-r1.ebuild
112
113 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.1-r1.ebuild?rev=1.1&view=markup
114 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.1-r1.ebuild?rev=1.1&content-type=text/plain
115
116 Index: qwt-6.0.1-r1.ebuild
117 ===================================================================
118 # Copyright 1999-2012 Gentoo Foundation
119 # Distributed under the terms of the GNU General Public License v2
120 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.1-r1.ebuild,v 1.1 2012/08/31 06:51:31 jlec Exp $
121
122 EAPI=4
123
124 inherit eutils qt4-r2
125
126 MY_P="${PN}-${PV/_/-}"
127
128 DESCRIPTION="2D plotting library for Qt4"
129 HOMEPAGE="http://qwt.sourceforge.net/"
130 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
131
132 LICENSE="qwt"
133 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
134 SLOT="6"
135 IUSE="doc examples svg"
136
137 DEPEND="
138 x11-libs/qt-gui:4
139 doc? ( !<media-libs/coin-3.1.3[doc] )
140 svg? ( x11-libs/qt-svg:4 )"
141 RDEPEND="${DEPEND}"
142
143 S="${WORKDIR}"/${MY_P}
144
145 DOCS="CHANGES README"
146
147 src_prepare() {
148 cat > qwtconfig.pri <<-EOF
149 QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
150 QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
151 QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
152 QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
153 VERSION = ${PV/_*}
154 QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
155 QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
156 EOF
157
158 cat > qwtbuild.pri <<-EOF
159 QWT_CONFIG += qt warn_on thread release no_keywords
160 EOF
161
162 # don't build examples - fix the qt files to build once installed
163 cat > examples/examples.pri <<-EOF
164 include( qwtconfig.pri )
165 TEMPLATE = app
166 MOC_DIR = moc
167 INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
168 DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
169 LIBS += -lqwt
170 EOF
171 sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
172 sed \
173 -e 's/target doc/target/' \
174 -i src/src.pro || die
175
176 # Renaming lib to libqwt6.so to enable slotting
177 sed \
178 -e "/^TARGET/s:qwt:qwt6:g" \
179 -i src/src.pro || die
180 sed \
181 -e '/qtAddLibrary/s:qwt:qwt6:g' \
182 -i qwt.prf designer/designer.pro || die
183 sed \
184 -e 's:libqwt:libqwt6:g' \
185 -i qwtbuild.pri || die
186
187 use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
188 cp *.pri examples/ || die
189 }
190
191 src_compile() {
192 # split compilation to allow parallel building
193 emake sub-src
194 emake
195 }
196
197 src_install () {
198 qt4-r2_src_install
199 if use doc; then
200 dohtml -r doc/html/*
201 fi
202 if use examples; then
203 insinto /usr/share/doc/${PF}
204 doins -r examples
205 fi
206 }
Report Message
Find on MARC Find on Google Groups