Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/
Date: Fri, 18 Jan 2019 09:27:20
Message-Id: 1547803629.972f03ddb5bd6b5dd18ca1599fd625b805fdde1a.jer@gentoo
1 commit: 972f03ddb5bd6b5dd18ca1599fd625b805fdde1a
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 18 08:16:55 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 18 09:27:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972f03dd
7
8 dev-util/cppcheck: Old
9
10 Package-Manager: Portage-2.3.56, Repoman-2.3.12
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 dev-util/cppcheck/Manifest | 2 -
14 dev-util/cppcheck/cppcheck-1.81.ebuild | 107 -------------------------------
15 dev-util/cppcheck/cppcheck-1.85.ebuild | 113 ---------------------------------
16 3 files changed, 222 deletions(-)
17
18 diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
19 index ea5ae23f704..db300ae3070 100644
20 --- a/dev-util/cppcheck/Manifest
21 +++ b/dev-util/cppcheck/Manifest
22 @@ -1,3 +1 @@
23 -DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B 2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f SHA512 22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
24 -DIST cppcheck-1.85.tar.gz 2150637 BLAKE2B 73a1d4e1fb0770103c8163f35b9e710a5863561df66e46e319b9246ed14e3c5d4d73511db6e70275de4f4510866d7e1888b0fd6b49e5b01fc4f08d081119b36c SHA512 cc984c751d87150839782e96b3762dbf918d9e3687562eabaff6473e48e3254995dd3bffe8605842f867d7ad76845ca2248a53bbd54b5c367281db8a1c1c7fad
25 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
26
27 diff --git a/dev-util/cppcheck/cppcheck-1.81.ebuild b/dev-util/cppcheck/cppcheck-1.81.ebuild
28 deleted file mode 100644
29 index 0604af4239e..00000000000
30 --- a/dev-util/cppcheck/cppcheck-1.81.ebuild
31 +++ /dev/null
32 @@ -1,107 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
39 -
40 -inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
41 -
42 -DESCRIPTION="Static analyzer of C/C++ code"
43 -HOMEPAGE="http://cppcheck.sourceforge.net"
44 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
45 -
46 -LICENSE="GPL-3"
47 -SLOT="0"
48 -KEYWORDS="amd64 ~arm ~arm64 hppa sparc x86"
49 -IUSE="htmlreport pcre qt5"
50 -
51 -RDEPEND="
52 - dev-libs/tinyxml2:=
53 - htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
54 - pcre? ( dev-libs/libpcre )
55 - qt5? (
56 - dev-qt/qtcore:5
57 - dev-qt/qtgui:5
58 - dev-qt/qtprintsupport:5
59 - )
60 -"
61 -DEPEND="${RDEPEND}
62 - app-text/docbook-xsl-stylesheets
63 - dev-libs/libxslt
64 - virtual/pkgconfig
65 -"
66 -
67 -PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
68 -
69 -src_prepare() {
70 - default
71 - append-cxxflags -std=c++0x
72 -
73 - # Drop bundled libs, patch Makefile generator and re-run it
74 - rm -r externals/tinyxml || die
75 - tc-export CXX
76 - emake dmake
77 - ./dmake || die
78 -}
79 -
80 -src_configure() {
81 - if use pcre ; then
82 - sed -e '/HAVE_RULES=/s:=no:=yes:' \
83 - -i Makefile
84 - fi
85 -}
86 -
87 -src_compile() {
88 - export LIBS="$(pkg-config --libs tinyxml2)"
89 - emake ${PN} man \
90 - CFGDIR="${EROOT}usr/share/${PN}/cfg" \
91 - DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
92 -
93 - if use qt5 ; then
94 - pushd gui
95 - eqmake5
96 - emake
97 - popd
98 - fi
99 - if use htmlreport ; then
100 - pushd htmlreport
101 - distutils-r1_src_compile
102 - popd
103 - fi
104 -}
105 -
106 -src_test() {
107 - # safe final version
108 - mv -v ${PN}{,.final}
109 - mv -v lib/library.o{,.final}
110 - mv -v cli/cppcheckexecutor.o{,.final}
111 - #trigger recompile with CFGDIR inside ${S}
112 - emake check CFGDIR="${S}/cfg"
113 - # restore
114 - mv -v ${PN}{.final,}
115 - mv -v lib/library.o{.final,}
116 - mv -v cli/cppcheckexecutor.o{.final,}
117 -}
118 -
119 -src_install() {
120 - # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
121 - emake install DESTDIR="${ED}"
122 -
123 - insinto "/usr/share/${PN}/cfg"
124 - doins cfg/*.cfg
125 - if use qt5 ; then
126 - dobin gui/${PN}-gui
127 - dodoc gui/{projectfile.txt,gui.${PN}}
128 - fi
129 - if use htmlreport ; then
130 - pushd htmlreport
131 - distutils-r1_src_install
132 - popd
133 - find "${D}" -name "*.egg-info" -delete
134 - else
135 - rm "${ED}/usr/bin/cppcheck-htmlreport" || die
136 - fi
137 - doman ${PN}.1
138 - dodoc -r triage
139 -}
140
141 diff --git a/dev-util/cppcheck/cppcheck-1.85.ebuild b/dev-util/cppcheck/cppcheck-1.85.ebuild
142 deleted file mode 100644
143 index 87931e60c7b..00000000000
144 --- a/dev-util/cppcheck/cppcheck-1.85.ebuild
145 +++ /dev/null
146 @@ -1,113 +0,0 @@
147 -# Copyright 1999-2018 Gentoo Authors
148 -# Distributed under the terms of the GNU General Public License v2
149 -
150 -EAPI=7
151 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
152 -inherit distutils-r1 qmake-utils toolchain-funcs
153 -
154 -DESCRIPTION="Static analyzer of C/C++ code"
155 -HOMEPAGE="http://cppcheck.sourceforge.net"
156 -SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
157 -
158 -LICENSE="GPL-3+"
159 -SLOT="0"
160 -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
161 -IUSE="htmlreport pcre qt5"
162 -
163 -RDEPEND="
164 - dev-libs/tinyxml2:=
165 - htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
166 - pcre? ( dev-libs/libpcre )
167 - qt5? (
168 - dev-qt/qtcore:5
169 - dev-qt/qtgui:5
170 - dev-qt/qtprintsupport:5
171 - )
172 -"
173 -DEPEND="${RDEPEND}
174 - app-text/docbook-xsl-stylesheets
175 - dev-libs/libxslt
176 - virtual/pkgconfig
177 -"
178 -PATCHES=(
179 - "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
180 - "${FILESDIR}"/${PN}-1.85-ldflags.patch
181 -)
182 -
183 -src_prepare() {
184 - default
185 -
186 - rm -r externals/tinyxml || die
187 -}
188 -
189 -src_configure() {
190 - tc-export CXX PKG_CONFIG
191 - export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
192 -
193 - emake dmake
194 - ./dmake || die
195 -
196 - if use pcre ; then
197 - sed -e '/HAVE_RULES=/s:=no:=yes:' \
198 - -i Makefile || die
199 - fi
200 -
201 - if use qt5 ; then
202 - pushd gui || die
203 - eqmake5
204 - popd || die
205 - fi
206 -}
207 -
208 -src_compile() {
209 - emake ${PN} man \
210 - CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
211 - DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
212 -
213 - if use qt5 ; then
214 - pushd gui || die
215 - emake
216 - popd || die
217 - fi
218 -
219 - if use htmlreport ; then
220 - pushd htmlreport || die
221 - distutils-r1_src_compile
222 - popd || die
223 - fi
224 -}
225 -
226 -src_test() {
227 - # safe final version
228 - mv -v ${PN}{,.final} || die
229 - mv -v lib/library.o{,.final} || die
230 - mv -v cli/cppcheckexecutor.o{,.final} || die
231 - #trigger recompile with CFGDIR inside ${S}
232 - emake check CFGDIR="${S}/cfg"
233 - # restore
234 - mv -v ${PN}{.final,} || die
235 - mv -v lib/library.o{.final,} || die
236 - mv -v cli/cppcheckexecutor.o{.final,} || die
237 -}
238 -
239 -src_install() {
240 - # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
241 - emake install DESTDIR="${ED}"
242 -
243 - insinto "/usr/share/${PN}/cfg"
244 - doins cfg/*.cfg
245 - if use qt5 ; then
246 - dobin gui/${PN}-gui
247 - dodoc gui/{projectfile.txt,gui.${PN}}
248 - fi
249 - if use htmlreport ; then
250 - pushd htmlreport || die
251 - distutils-r1_src_install
252 - popd || die
253 - find "${D}" -name "*.egg-info" -delete
254 - else
255 - rm "${ED}/usr/bin/cppcheck-htmlreport" || die
256 - fi
257 - doman ${PN}.1
258 - dodoc -r triage
259 -}