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/qwtpolar/
Date: Mon, 23 Jan 2017 02:38:32
Message-Id: 1485139079.7c6a005a245baf2bfa8baaa5bed8d258e17b98f9.asturm@gentoo
1 commit: 7c6a005a245baf2bfa8baaa5bed8d258e17b98f9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 23 02:29:33 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 23 02:37:59 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6a005a
7
8 x11-libs/qwtpolar: Add USE=qt4,qt5 and fix DEPENDs, EAPI 6
9
10 Gentoo-bug: 597458
11
12 SRC_URI: Prefer upstream's tar.bz2
13 Switch to qmake-utils.
14
15 Package-Manager: portage-2.3.0
16
17 x11-libs/qwtpolar/Manifest | 1 +
18 x11-libs/qwtpolar/metadata.xml | 14 +++----
19 x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild | 63 ++++++++++++++++++++++++++++++
20 3 files changed, 71 insertions(+), 7 deletions(-)
21
22 diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
23 index 7060a66..15f6be2 100644
24 --- a/x11-libs/qwtpolar/Manifest
25 +++ b/x11-libs/qwtpolar/Manifest
26 @@ -1,4 +1,5 @@
27 DIST qwtpolar-0.1.0.tar.bz2 768348 SHA256 af08b0106b1f7187db02dfd7e36f59ad185fbe72d72c62a6c91e9f492127a481 SHA512 8a11a64d52547fd801a78874daa806540c5efa5828ee7783a1d468cc09667b1b87edcafa134b8c1b8c818c5bcb04f7e42ac836b10f165d002cc90e68294479f5 WHIRLPOOL 6ef7de2a2cf6df068e309fe0d1d60aba5f05fa2cf6733a4fd0df2205a1f029d8781623411a2100666102a51d64787a8154764a6719950881bfaf2840b5cf3b6a
28 DIST qwtpolar-1.0.0.zip 636765 SHA256 046cb0378134dbec76fc60435f93fe433c155087a03114eb1b96b605ee0e1e76 SHA512 94536af39e3658d56758d201a29c2e0aaec109ca37b3f9a4e7e7722ea7f63f45e31026d112b384b8e75008c93d10a070ebaa85c0c745a7d11529f7d1de10d4ba WHIRLPOOL 3c8a5d4ffbb8e4b9fc4cfbab3f7faaa1d7c16833c79b43633ded63f89f6efe80b2961985f0ce3d26ede52c48fae934a65616f5b18ecfd03b932225de6b0abae9
29 DIST qwtpolar-1.1.0.zip 939175 SHA256 21ba860195985bfcb4e54da6a48aba4f7db44f01a6f26bbe6ffa9123802b78df SHA512 48bc5da93ed18aa83907651569245b77a6bce43e9e87d38f4531fecb20d74bdce4b0a18cee0722065637577cd73937ed8e3b5253df5262347ac382b1673233c0 WHIRLPOOL ba09b46a9da8604feb55bee31d2d336fbe746f2c1b3fb44ec4356f50860d03c713e2049421669a0bf67656afc241e5153c8dd2619d3745b699bfae1316db641c
30 +DIST qwtpolar-1.1.1.tar.bz2 565546 SHA256 6168baa9dbc8d527ae1ebf2631313291a1d545da268a05f4caa52ceadbe8b295 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621 WHIRLPOOL e03906b22f06d6ea42ab0609d28a578be70c4d5c9a71d0cb00f40e2630f2868890085434e4f2833280db2c445eaefc16bfd321a3d4f5cc9e1538a608fd1d727b
31 DIST qwtpolar-1.1.1.zip 939433 SHA256 41a820400af25190bf6a1a49d49410f9bd8423fabde2f2028b52086b640b4e27 SHA512 d3dfffa2f305be6ee51caf42fe08b5374d78a8916e91055974565b6dc7d7fe0b3fd166de06bc7a6c634a340a94abd27774186238c4a63096522b20576bccac67 WHIRLPOOL 2794b99fb613c1fe33056d107b11d1252a990c464230af57c844519fcb85e2ba60958d1937f8ea0244fdc7d7923a8d85617a2efe3ecb580e8624af1ca73288bd
32
33 diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml
34 index 86b6ec2..5b5806a 100644
35 --- a/x11-libs/qwtpolar/metadata.xml
36 +++ b/x11-libs/qwtpolar/metadata.xml
37 @@ -1,11 +1,11 @@
38 <?xml version="1.0" encoding="UTF-8"?>
39 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
40 <pkgmetadata>
41 - <maintainer type="project">
42 - <email>sci-geosciences@g.o</email>
43 - <name>Gentoo Geosciences Project</name>
44 - </maintainer>
45 - <upstream>
46 - <remote-id type="sourceforge">qwtpolar</remote-id>
47 - </upstream>
48 + <maintainer type="project">
49 + <email>sci-geosciences@g.o</email>
50 + <name>Gentoo Geosciences Project</name>
51 + </maintainer>
52 + <upstream>
53 + <remote-id type="sourceforge">qwtpolar</remote-id>
54 + </upstream>
55 </pkgmetadata>
56
57 diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
58 new file mode 100644
59 index 00000000..205777e
60 --- /dev/null
61 +++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
62 @@ -0,0 +1,63 @@
63 +# Copyright 1999-2017 Gentoo Foundation
64 +# Distributed under the terms of the GNU General Public License v2
65 +# $Id$
66 +
67 +EAPI=6
68 +
69 +inherit qmake-utils
70 +
71 +DESCRIPTION="Library for displaying values on a polar coordinate system"
72 +HOMEPAGE="http://qwtpolar.sourceforge.net/"
73 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
74 +
75 +LICENSE="qwt"
76 +SLOT="0"
77 +KEYWORDS="~amd64 ~x86"
78 +IUSE="qt4 qt5"
79 +
80 +REQUIRED_USE="^^ ( qt4 qt5 )"
81 +
82 +RDEPEND="
83 + qt4? ( x11-libs/qwt:6=[designer,qt4(+),svg] )
84 + qt5? ( x11-libs/qwt:6=[designer,qt5,svg] )
85 +"
86 +DEPEND="${RDEPEND}"
87 +
88 +src_prepare() {
89 + default
90 +
91 + local qtplugindir=$(qt4_get_plugindir)
92 + use qt5 && qtplugindir=$(qt5_get_plugindir)
93 +
94 + sed \
95 + -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
96 + -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
97 + -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
98 + -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${qtplugindir}/designer/:g" \
99 + -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${qtplugindir}/features/:g" \
100 + -e "/= QwtPolarDesigner/ d" \
101 + -e "/= QwtPolarExamples/d" \
102 + -i ${PN}config.pri || die
103 +
104 + sed \
105 + -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
106 + -i src/src.pro || die
107 + echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
108 + cat >> designer/designer.pro <<- EOF
109 + INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
110 + LIBS += -L"${S}/$(get_libdir)"
111 + EOF
112 +}
113 +
114 +src_configure() {
115 + if use qt5; then
116 + eqmake5
117 + else
118 + eqmake4
119 + fi
120 +}
121 +
122 +src_install() {
123 + emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
124 + einstalldocs
125 +}