Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
Date: Thu, 02 Mar 2017 19:39:36
Message-Id: 1488483555.b016c7f13ac1ecc07d8be0a60c71bbc77d4afaab.asturm@gentoo
1 commit: b016c7f13ac1ecc07d8be0a60c71bbc77d4afaab
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 27 00:58:33 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 2 19:39:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b016c7f1
7
8 x11-libs/qwt: Drop old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Closes: https://github.com/gentoo/gentoo/pull/4099
12
13 x11-libs/qwt/Manifest | 1 -
14 x11-libs/qwt/qwt-6.1.2-r2.ebuild | 209 ---------------------------------------
15 2 files changed, 210 deletions(-)
16
17 diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
18 index e7d2f83b531..388f3afcffe 100644
19 --- a/x11-libs/qwt/Manifest
20 +++ b/x11-libs/qwt/Manifest
21 @@ -1,4 +1,3 @@
22 DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
23 DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
24 -DIST qwt-6.1.2.tar.bz2 3528935 SHA256 2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c SHA512 ddaf265890e493554639deae8b3ba3a1673bd6bcb4a7c47931d10aaab550646d103b28dccd3c2e4fdacd56a7963837c25ab02e27c71f891fee1801bcd45d54c0 WHIRLPOOL 575f8c3665ed8075278300f625bb9b321bd2c275573bd4c22cc1b833fde7fa38c36db027216d5da43839d9c70e0ed443327af2d54ac5a4dff3643c7abee16069
25 DIST qwt-6.1.3.tar.bz2 4245614 SHA256 f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733 SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a WHIRLPOOL ebcc43a29bb056d6fc4433a63b07e0dcfa6e09b5581d7ff9d96c09826faec9ea62c1d6d6f3ee2e79859c56df491ee65b29b08cb9a3b0644a0eace3351c4a322c
26
27 diff --git a/x11-libs/qwt/qwt-6.1.2-r2.ebuild b/x11-libs/qwt/qwt-6.1.2-r2.ebuild
28 deleted file mode 100644
29 index 7385a72df38..00000000000
30 --- a/x11-libs/qwt/qwt-6.1.2-r2.ebuild
31 +++ /dev/null
32 @@ -1,209 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit eutils multibuild multilib qmake-utils
39 -
40 -MY_P="${PN}-${PV/_/-}"
41 -
42 -DESCRIPTION="2D plotting library for Qt4 and Qt5"
43 -HOMEPAGE="http://qwt.sourceforge.net/"
44 -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
45 -
46 -LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
47 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
48 -SLOT="6/1.2"
49 -IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
50 -
51 -REQUIRED_USE="|| ( qt4 qt5 )"
52 -
53 -DEPEND="
54 - !<x11-libs/qwt-5.2.3
55 - qt4? (
56 - dev-qt/qtcore:4
57 - dev-qt/qtgui:4
58 - designer? ( dev-qt/designer:4 )
59 - opengl? ( dev-qt/qtopengl:4 )
60 - svg? ( dev-qt/qtsvg:4 )
61 - )
62 - qt5? (
63 - dev-qt/qtconcurrent:5
64 - dev-qt/qtcore:5
65 - dev-qt/qtgui:5
66 - dev-qt/qtprintsupport:5
67 - dev-qt/qtwidgets:5
68 - designer? ( dev-qt/designer:5 )
69 - opengl? ( dev-qt/qtopengl:5 )
70 - svg? ( dev-qt/qtsvg:5 )
71 - )
72 - doc? ( !<media-libs/coin-3.1.3[doc] )
73 - opengl? ( virtual/opengl )
74 - "
75 -RDEPEND="${DEPEND}"
76 -
77 -S="${WORKDIR}"/${MY_P}
78 -
79 -DOCS="README"
80 -
81 -PATCHES=(
82 - "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
83 - "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
84 - )
85 -
86 -src_prepare() {
87 - cat > qwtconfig.pri <<-EOF
88 - QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
89 - QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
90 - QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
91 - QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
92 - VERSION = ${PV/_*}
93 - QWT_VERSION = ${PV/_*}
94 - EOF
95 -
96 - use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
97 - use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
98 - use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
99 - use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
100 -
101 - cat > qwtbuild.pri <<-EOF
102 - QWT_CONFIG += qt warn_on thread release no_keywords
103 - EOF
104 -
105 - MULTIBUILD_VARIANTS=( )
106 -
107 - if use qt4; then
108 - use static-libs && MULTIBUILD_VARIANTS+=( qt4-static )
109 - MULTIBUILD_VARIANTS+=( qt4-shared )
110 - fi
111 -
112 - if use qt5; then
113 - use static-libs && MULTIBUILD_VARIANTS+=( qt5-static )
114 - MULTIBUILD_VARIANTS+=( qt5-shared )
115 - fi
116 -
117 - multibuild_copy_sources
118 -
119 - preparation() {
120 - if [[ ${MULTIBUILD_VARIANT} == *-shared ]]; then
121 - echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
122 - fi
123 -
124 - case "${MULTIBUILD_VARIANT}" in
125 - qt4-*)
126 - cat >> qwtconfig.pri <<-EOF
127 - QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
128 - QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features"
129 - EOF
130 - sed \
131 - -e 's/target doc/target/' \
132 - -e "/^TARGET/s:(qwt):(qwt6-qt4):g" \
133 - -e "/^TARGET/s:qwt):qwt6-qt4):g" \
134 - -i src/src.pro || die
135 -
136 - sed \
137 - -e '/qwtAddLibrary/s:(qwt):(qwt6-qt4):g' \
138 - -e '/qwtAddLibrary/s:qwt):qwt6-qt4):g' \
139 - -i qwt.prf designer/designer.pro examples/examples.pri \
140 - textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
141 -
142 - ;;
143 - qt5-*)
144 - cat >> qwtconfig.pri <<-EOF
145 - QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt5/plugins/designer"
146 - QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/features"
147 - EOF
148 - sed \
149 - -e 's/target doc/target/' \
150 - -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
151 - -e "/^TARGET/s:qwt):qwt6-qt5):g" \
152 - -i src/src.pro || die
153 -
154 - sed \
155 - -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
156 - -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
157 - -i qwt.prf designer/designer.pro examples/examples.pri \
158 - textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
159 - ;;
160 - esac
161 - default
162 - }
163 -
164 - multibuild_foreach_variant run_in_build_dir preparation
165 -}
166 -
167 -src_configure() {
168 - configuration() {
169 - case "${MULTIBUILD_VARIANT}" in
170 - qt4-*)
171 - eqmake4
172 - ;;
173 - qt5-*)
174 - eqmake5
175 - ;;
176 - esac
177 - }
178 - multibuild_foreach_variant run_in_build_dir configuration
179 -}
180 -
181 -src_compile() {
182 - multibuild_foreach_variant run_in_build_dir default
183 -}
184 -
185 -src_test() {
186 - testing() {
187 - cd examples || die
188 - case "${MULTIBUILD_VARIANT}" in
189 - qt4-*)
190 - eqmake4 examples.pro
191 - ;;
192 - qt5-*)
193 - eqmake5 examples.pro
194 - ;;
195 - esac
196 - emake
197 - }
198 - multibuild_foreach_variant run_in_build_dir testing
199 -}
200 -
201 -src_install () {
202 - rm -f doc/man/*/{_,deprecated}* || die
203 -
204 - multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install
205 -
206 - if use qt4; then
207 - mv "${ED}"/usr/$(get_libdir)/pkgconfig/qwt6{-qt4,}.pc || die
208 - fi
209 -
210 - if use mathml; then
211 - sed \
212 - -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
213 - -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
214 - fi
215 -
216 - if use doc; then
217 - dohtml -r doc/html/*
218 - else
219 - rm -rf "${ED}"/usr/share/doc/${PF}/html || die
220 - fi
221 -
222 - mkdir -p "${ED}"/usr/share/man/ || die
223 - mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \
224 - rmdir "${ED}"/usr/share/doc/${PF}/man || die
225 -
226 - if use examples; then
227 - # don't build examples - fix the qt files to build once installed
228 - cat > examples/examples.pri <<-EOF
229 - include( qwtconfig.pri )
230 - TEMPLATE = app
231 - MOC_DIR = moc
232 - INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
233 - DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
234 - LIBS += -lqwt6
235 - EOF
236 - sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
237 - cp *.pri examples/ || die
238 - insinto /usr/share/${PN}6
239 - doins -r examples
240 - fi
241 -}