| 1 |
jlec 13/03/05 12:56:07 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: qwt-5.2.3-r1.ebuild qwt-6.0.2-r1.ebuild |
| 5 |
Log: |
| 6 |
x11-libs/qwt: Fix installation location for designer and plugin stuff, #460256; add static-libs support, #260324 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.107 x11-libs/qwt/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.107&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?rev=1.107&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/ChangeLog?r1=1.106&r2=1.107 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v |
| 20 |
retrieving revision 1.106 |
| 21 |
retrieving revision 1.107 |
| 22 |
diff -u -r1.106 -r1.107 |
| 23 |
--- ChangeLog 4 Mar 2013 18:30:58 -0000 1.106 |
| 24 |
+++ ChangeLog 5 Mar 2013 12:56:06 -0000 1.107 |
| 25 |
@@ -1,6 +1,14 @@ |
| 26 |
# ChangeLog for x11-libs/qwt |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.106 2013/03/04 18:30:58 jlec Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.107 2013/03/05 12:56:06 jlec Exp $ |
| 30 |
+ |
| 31 |
+*qwt-6.0.2-r1 (05 Mar 2013) |
| 32 |
+*qwt-5.2.3-r1 (05 Mar 2013) |
| 33 |
+ |
| 34 |
+ 05 Mar 2013; Justin Lecher <jlec@g.o> +qwt-5.2.3-r1.ebuild, |
| 35 |
+ +files/qwt-5.2.3-install_qt.patch, +qwt-6.0.2-r1.ebuild: |
| 36 |
+ Fix installation location for designer and plugin stuff, #460256; add |
| 37 |
+ static-libs support, #260324 |
| 38 |
|
| 39 |
*qwt-5.2.3 (04 Mar 2013) |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 x11-libs/qwt/qwt-5.2.3-r1.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.3-r1.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-5.2.3-r1.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: qwt-5.2.3-r1.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2013 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.3-r1.ebuild,v 1.1 2013/03/05 12:56:06 jlec Exp $ |
| 54 |
|
| 55 |
EAPI=5 |
| 56 |
|
| 57 |
inherit eutils qt4-r2 |
| 58 |
|
| 59 |
DESCRIPTION="2D plotting library for Qt4" |
| 60 |
HOMEPAGE="http://qwt.sourceforge.net/" |
| 61 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
| 62 |
|
| 63 |
LICENSE="qwt" |
| 64 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos" |
| 65 |
SLOT="5" |
| 66 |
IUSE="doc examples static-libs svg" |
| 67 |
|
| 68 |
DEPEND=" |
| 69 |
dev-qt/qtgui:4 |
| 70 |
doc? ( !<media-libs/coin-3.1.3[doc] ) |
| 71 |
svg? ( dev-qt/qtsvg:4 )" |
| 72 |
RDEPEND="${DEPEND}" |
| 73 |
|
| 74 |
DOCS="CHANGES README" |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
epatch "${FILESDIR}"/${P}-install_qt.patch |
| 78 |
sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i ${PN}.prf || die |
| 79 |
|
| 80 |
cat > qwtconfig.pri <<-EOF |
| 81 |
target.path = "${EPREFIX}/usr/$(get_libdir)" |
| 82 |
headers.path = "${EPREFIX}/usr/include/qwt5" |
| 83 |
doc.path = "${EPREFIX}/usr/share/doc/${PF}" |
| 84 |
CONFIG += qt warn_on thread release |
| 85 |
CONFIG += QwtDll |
| 86 |
CONFIG += QwtPlot QwtWidgets QwtDesigner |
| 87 |
VERSION = ${PV} |
| 88 |
QWT_VERSION = ${PV/_*} |
| 89 |
QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer" |
| 90 |
QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features" |
| 91 |
EOF |
| 92 |
sed -i -e 's/headers doc/headers/' src/src.pro || die |
| 93 |
use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem" |
| 94 |
} |
| 95 |
|
| 96 |
src_compile() { |
| 97 |
building() { |
| 98 |
# split compilation to allow parallel building |
| 99 |
emake sub-src |
| 100 |
emake |
| 101 |
} |
| 102 |
building |
| 103 |
|
| 104 |
if use static-libs; then |
| 105 |
sed "/QwtDll/d" -i qwtconfig.pri || die |
| 106 |
eqmake4 |
| 107 |
building |
| 108 |
echo "CONFIG += QwtDll" >> qwtconfig.pri || die |
| 109 |
fi |
| 110 |
} |
| 111 |
|
| 112 |
src_test() { |
| 113 |
cd examples || die |
| 114 |
eqmake4 examples.pro |
| 115 |
emake |
| 116 |
} |
| 117 |
|
| 118 |
src_install () { |
| 119 |
qt4-r2_src_install |
| 120 |
|
| 121 |
use static-libs && dolib.a lib/libqwt.a |
| 122 |
|
| 123 |
if use doc; then |
| 124 |
insinto /usr/share/doc/${PF} |
| 125 |
rm doc/man/*/*license* |
| 126 |
doman doc/man/*/* |
| 127 |
doins -r doc/html |
| 128 |
fi |
| 129 |
if use examples; then |
| 130 |
# don't build examples - fix the qt files to build once installed |
| 131 |
cat > examples/examples.pri <<-EOF |
| 132 |
include( qwtconfig.pri ) |
| 133 |
TEMPLATE = app |
| 134 |
MOC_DIR = moc |
| 135 |
INCLUDEPATH += "${EPREFIX}/usr/include/qwt5" |
| 136 |
DEPENDPATH += "${EPREFIX}/usr/include/qwt5" |
| 137 |
LIBS += -lqwt |
| 138 |
EOF |
| 139 |
sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die |
| 140 |
cp *.pri examples/ || die |
| 141 |
doins -r examples |
| 142 |
fi |
| 143 |
} |
| 144 |
|
| 145 |
|
| 146 |
|
| 147 |
1.1 x11-libs/qwt/qwt-6.0.2-r1.ebuild |
| 148 |
|
| 149 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.2-r1.ebuild?rev=1.1&view=markup |
| 150 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qwt/qwt-6.0.2-r1.ebuild?rev=1.1&content-type=text/plain |
| 151 |
|
| 152 |
Index: qwt-6.0.2-r1.ebuild |
| 153 |
=================================================================== |
| 154 |
# Copyright 1999-2013 Gentoo Foundation |
| 155 |
# Distributed under the terms of the GNU General Public License v2 |
| 156 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.0.2-r1.ebuild,v 1.1 2013/03/05 12:56:06 jlec Exp $ |
| 157 |
|
| 158 |
EAPI=5 |
| 159 |
|
| 160 |
inherit eutils qt4-r2 |
| 161 |
|
| 162 |
MY_P="${PN}-${PV/_/-}" |
| 163 |
|
| 164 |
DESCRIPTION="2D plotting library for Qt4" |
| 165 |
HOMEPAGE="http://qwt.sourceforge.net/" |
| 166 |
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2" |
| 167 |
|
| 168 |
LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" |
| 169 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" |
| 170 |
SLOT="6" |
| 171 |
IUSE="doc examples mathml static-libs svg" |
| 172 |
|
| 173 |
DEPEND=" |
| 174 |
dev-qt/qtgui:4 |
| 175 |
doc? ( !<media-libs/coin-3.1.3[doc] ) |
| 176 |
svg? ( dev-qt/qtsvg:4 )" |
| 177 |
RDEPEND="${DEPEND}" |
| 178 |
|
| 179 |
S="${WORKDIR}"/${MY_P} |
| 180 |
|
| 181 |
DOCS="CHANGES README" |
| 182 |
|
| 183 |
src_prepare() { |
| 184 |
cat > qwtconfig.pri <<-EOF |
| 185 |
QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" |
| 186 |
QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" |
| 187 |
QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" |
| 188 |
QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner |
| 189 |
VERSION = ${PV/_*} |
| 190 |
QWT_VERSION = ${PV/_*} |
| 191 |
QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer" |
| 192 |
QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features" |
| 193 |
EOF |
| 194 |
if use mathml; then |
| 195 |
cat >> qwtconfig.pri <<-EOF |
| 196 |
QWT_CONFIG += QwtMathML |
| 197 |
EOF |
| 198 |
fi |
| 199 |
cat > qwtbuild.pri <<-EOF |
| 200 |
QWT_CONFIG += qt warn_on thread release no_keywords |
| 201 |
EOF |
| 202 |
|
| 203 |
sed \ |
| 204 |
-e 's/target doc/target/' \ |
| 205 |
-i src/src.pro || die |
| 206 |
|
| 207 |
# Renaming lib to libqwt6.so to enable slotting |
| 208 |
sed \ |
| 209 |
-e "/^TARGET/s:(qwt):(qwt6):g" \ |
| 210 |
-i src/src.pro || die |
| 211 |
sed \ |
| 212 |
-e '/qwtAddLibrary/s:(qwt):(qwt6):g' \ |
| 213 |
-i qwt.prf designer/designer.pro examples/examples.pri \ |
| 214 |
textengines/mathml/qwtmathml.prf textengines/textengines.pri || die |
| 215 |
sed \ |
| 216 |
-e 's:libqwt:libqwt6:g' \ |
| 217 |
-i qwtbuild.pri || die |
| 218 |
|
| 219 |
use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri |
| 220 |
|
| 221 |
epatch "${FILESDIR}/${PN}-6.0.2-invalid-read.patch" |
| 222 |
} |
| 223 |
|
| 224 |
src_compile() { |
| 225 |
building() { |
| 226 |
# split compilation to allow parallel building |
| 227 |
emake sub-src |
| 228 |
emake |
| 229 |
} |
| 230 |
building |
| 231 |
|
| 232 |
if use static-libs; then |
| 233 |
sed "/QwtDll/d" -i qwtconfig.pri || die |
| 234 |
eqmake4 |
| 235 |
building |
| 236 |
echo "CONFIG += QwtDll" >> qwtconfig.pri || die |
| 237 |
fi |
| 238 |
} |
| 239 |
|
| 240 |
src_test() { |
| 241 |
cd examples || die |
| 242 |
eqmake4 examples.pro |
| 243 |
emake |
| 244 |
} |
| 245 |
|
| 246 |
src_install () { |
| 247 |
qt4-r2_src_install |
| 248 |
|
| 249 |
use static-libs && dolib.a lib/libqwt.a |
| 250 |
|
| 251 |
if use doc; then |
| 252 |
dohtml -r doc/html/* |
| 253 |
fi |
| 254 |
if use examples; then |
| 255 |
# don't build examples - fix the qt files to build once installed |
| 256 |
cat > examples/examples.pri <<-EOF |
| 257 |
include( qwtconfig.pri ) |
| 258 |
TEMPLATE = app |
| 259 |
MOC_DIR = moc |
| 260 |
INCLUDEPATH += "${EPREFIX}/usr/include/qwt6" |
| 261 |
DEPENDPATH += "${EPREFIX}/usr/include/qwt6" |
| 262 |
LIBS += -lqwt6 |
| 263 |
EOF |
| 264 |
sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die |
| 265 |
cp *.pri examples/ || die |
| 266 |
doins -r examples |
| 267 |
fi |
| 268 |
} |
Archives