Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
Date: Mon, 22 Nov 2021 15:52:19
Message-Id: 1637596324.21f316252605af6c72e5e0dec40923cab974448b.soap@gentoo
1 commit: 21f316252605af6c72e5e0dec40923cab974448b
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 22 15:52:04 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 15:52:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f31625
7
8 dev-util/cppcheck: drop 1.88, 2.2
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 dev-util/cppcheck/Manifest | 2 -
13 dev-util/cppcheck/cppcheck-1.88.ebuild | 115 ---------------------
14 dev-util/cppcheck/cppcheck-2.2.ebuild | 81 ---------------
15 .../cppcheck/files/cppcheck-1.88-ldflags.patch | 17 ---
16 .../cppcheck/files/cppcheck-1.88-tinyxml2.patch | 101 ------------------
17 5 files changed, 316 deletions(-)
18
19 diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
20 index c78e131f4306..5de50914c64f 100644
21 --- a/dev-util/cppcheck/Manifest
22 +++ b/dev-util/cppcheck/Manifest
23 @@ -1,3 +1 @@
24 -DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
25 -DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc SHA512 d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
26 DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B 4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c SHA512 8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
27
28 diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild
29 deleted file mode 100644
30 index 09857bcc74b6..000000000000
31 --- a/dev-util/cppcheck/cppcheck-1.88.ebuild
32 +++ /dev/null
33 @@ -1,115 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -PYTHON_COMPAT=( python{3_7,3_8,3_9} )
39 -inherit distutils-r1 qmake-utils toolchain-funcs
40 -
41 -DESCRIPTION="Static analyzer of C/C++ code"
42 -HOMEPAGE="https://github.com/danmar/cppcheck"
43 -SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
44 -
45 -LICENSE="GPL-3+"
46 -SLOT="0"
47 -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
48 -IUSE="htmlreport pcre qt5"
49 -
50 -RDEPEND="
51 - dev-libs/tinyxml2:=
52 - htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
53 - pcre? ( dev-libs/libpcre )
54 - qt5? (
55 - dev-qt/qtcore:5
56 - dev-qt/qtgui:5
57 - dev-qt/qtprintsupport:5
58 - )
59 -"
60 -DEPEND="${RDEPEND}"
61 -BDEPEND="
62 - app-text/docbook-xsl-stylesheets
63 - dev-libs/libxslt
64 - virtual/pkgconfig
65 -"
66 -
67 -PATCHES=(
68 - "${FILESDIR}"/${PN}-1.88-tinyxml2.patch
69 - "${FILESDIR}"/${PN}-1.88-ldflags.patch
70 -)
71 -
72 -src_prepare() {
73 - default
74 -
75 - rm -r externals/tinyxml || die
76 -}
77 -
78 -src_configure() {
79 - tc-export CXX PKG_CONFIG
80 - export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
81 -
82 - emake dmake
83 - ./dmake || die
84 -
85 - if use pcre ; then
86 - sed -e '/HAVE_RULES=/s:=no:=yes:' \
87 - -i Makefile || die
88 - fi
89 -
90 - if use qt5 ; then
91 - pushd gui || die
92 - eqmake5
93 - popd || die
94 - fi
95 -}
96 -
97 -src_compile() {
98 - emake ${PN} man \
99 - CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
100 - DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
101 -
102 - if use qt5 ; then
103 - pushd gui || die
104 - emake
105 - popd || die
106 - fi
107 -
108 - if use htmlreport ; then
109 - pushd htmlreport || die
110 - distutils-r1_src_compile
111 - popd || die
112 - fi
113 -}
114 -
115 -src_test() {
116 - # safe final version
117 - mv -v ${PN}{,.final} || die
118 - mv -v lib/library.o{,.final} || die
119 - mv -v cli/cppcheckexecutor.o{,.final} || die
120 - #trigger recompile with CFGDIR inside ${S}
121 - emake check CFGDIR="${S}/cfg"
122 - # restore
123 - mv -v ${PN}{.final,} || die
124 - mv -v lib/library.o{.final,} || die
125 - mv -v cli/cppcheckexecutor.o{.final,} || die
126 -}
127 -
128 -src_install() {
129 - # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
130 - emake install DESTDIR="${ED}"
131 -
132 - insinto "/usr/share/${PN}/cfg"
133 - doins cfg/*.cfg
134 - if use qt5 ; then
135 - dobin gui/${PN}-gui
136 - dodoc gui/{projectfile.txt,gui.${PN}}
137 - fi
138 - if use htmlreport ; then
139 - pushd htmlreport || die
140 - distutils-r1_src_install
141 - popd || die
142 - find "${D}" -name "*.egg-info" -delete
143 - else
144 - rm "${ED}/usr/bin/cppcheck-htmlreport" || die
145 - fi
146 - doman ${PN}.1
147 - dodoc -r tools/triage
148 -}
149
150 diff --git a/dev-util/cppcheck/cppcheck-2.2.ebuild b/dev-util/cppcheck/cppcheck-2.2.ebuild
151 deleted file mode 100644
152 index 175f33dd4bce..000000000000
153 --- a/dev-util/cppcheck/cppcheck-2.2.ebuild
154 +++ /dev/null
155 @@ -1,81 +0,0 @@
156 -# Copyright 1999-2021 Gentoo Authors
157 -# Distributed under the terms of the GNU General Public License v2
158 -
159 -EAPI=7
160 -PYTHON_COMPAT=( python{3_7,3_8,3_9} )
161 -inherit distutils-r1 toolchain-funcs cmake
162 -
163 -DESCRIPTION="Static analyzer of C/C++ code"
164 -HOMEPAGE="https://github.com/danmar/cppcheck"
165 -SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
166 -
167 -LICENSE="GPL-3+"
168 -SLOT="0"
169 -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
170 -IUSE="htmlreport pcre qt5 +z3"
171 -
172 -RDEPEND="
173 - htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
174 - pcre? ( dev-libs/libpcre )
175 - qt5? (
176 - dev-qt/qtcore:5
177 - dev-qt/qtgui:5
178 - dev-qt/qthelp
179 - dev-qt/qtprintsupport:5
180 - )
181 -"
182 -DEPEND="${RDEPEND}
183 - app-text/docbook-xsl-stylesheets
184 - dev-libs/libxslt
185 - virtual/pkgconfig
186 - z3? ( sci-mathematics/z3 )
187 -"
188 -
189 -src_prepare() {
190 - cmake_src_prepare
191 -}
192 -
193 -src_configure() {
194 -
195 - local mycmakeargs=(
196 - -DHAVE_RULES="$(usex pcre)"
197 - -DBUILD_GUI="$(usex qt5)"
198 - -DUSE_Z3="$(usex z3)"
199 - -DFILESDIR="${EROOT}/usr/share/${PN}/"
200 - -DENABLE_OSS_FUZZ=OFF
201 - )
202 - cmake_src_configure
203 -}
204 -
205 -src_compile() {
206 - cmake_src_compile
207 -
208 - if use htmlreport ; then
209 - pushd htmlreport || die
210 - distutils-r1_src_compile
211 - popd || die
212 - fi
213 -}
214 -
215 -src_install() {
216 - # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
217 - emake install DESTDIR="${ED}" \
218 - FILESDIR="${EROOT}/usr/share/${PN}/"
219 -
220 - insinto "/usr/share/${PN}/cfg"
221 - doins cfg/*.cfg
222 - if use qt5 ; then
223 - dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
224 - dodoc gui/{projectfile.txt,gui.${PN}}
225 - fi
226 - if use htmlreport ; then
227 - pushd htmlreport || die
228 - distutils-r1_src_install
229 - popd || die
230 - find "${D}" -name "*.egg-info" -delete
231 - else
232 - rm "${ED}/usr/bin/cppcheck-htmlreport" || die
233 - fi
234 -
235 - dodoc -r tools/triage
236 -}
237
238 diff --git a/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch b/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch
239 deleted file mode 100644
240 index ef7e01212a3f..000000000000
241 --- a/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch
242 +++ /dev/null
243 @@ -1,17 +0,0 @@
244 -diff --git a/tools/dmake.cpp b/tools/dmake.cpp
245 -index c3afd26..5c3a0a6 100644
246 ---- a/tools/dmake.cpp
247 -+++ b/tools/dmake.cpp
248 -@@ -370,10 +370,10 @@ int main(int argc, char **argv)
249 - fout << ".PHONY: run-dmake tags\n\n";
250 - fout << "\n###### Targets\n\n";
251 - fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
252 -- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
253 -+ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
254 - fout << "all:\tcppcheck testrunner\n\n";
255 - fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o\n";
256 -- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
257 -+ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
258 - fout << "test:\tall\n";
259 - fout << "\t./testrunner\n\n";
260 - fout << "check:\tall\n";
261
262 diff --git a/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch
263 deleted file mode 100644
264 index 0ad79ebf4d0d..000000000000
265 --- a/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch
266 +++ /dev/null
267 @@ -1,101 +0,0 @@
268 -diff --git a/gui/gui.pro b/gui/gui.pro
269 -index 0cbaebf..cb381dd 100644
270 ---- a/gui/gui.pro
271 -+++ b/gui/gui.pro
272 -@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
273 - DEFINES += CPPCHECKLIB_IMPORT
274 - }
275 - LIBS += -L$$PWD/../externals
276 -+LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
277 -
278 - DESTDIR = .
279 - RCC_DIR = temp
280 -diff --git a/tools/dmake.cpp b/tools/dmake.cpp
281 -index 298cb98..c3afd26 100644
282 ---- a/tools/dmake.cpp
283 -+++ b/tools/dmake.cpp
284 -@@ -122,7 +122,6 @@ int main(int argc, char **argv)
285 -
286 - std::vector<std::string> extfiles;
287 - extfiles.push_back("externals/simplecpp/simplecpp.cpp");
288 -- extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
289 -
290 - std::vector<std::string> clifiles;
291 - getCppFiles(clifiles, "cli/", false);
292 -@@ -171,7 +170,6 @@ int main(int argc, char **argv)
293 - std::ofstream fout1("test/testfiles.pri");
294 - if (fout1.is_open()) {
295 - fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
296 -- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
297 - fout1 << "\n\nSOURCES += ";
298 - for (unsigned int i = 0; i < testfiles.size(); ++i) {
299 - const std::string filename(testfiles[i].substr(5));
300 -@@ -341,9 +339,9 @@ int main(int argc, char **argv)
301 - << "endif\n\n";
302 -
303 - makeConditionalVariable(fout, "PREFIX", "/usr");
304 -- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml");
305 -- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp -isystem externals/tinyxml");
306 -- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml");
307 -+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp");
308 -+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp");
309 -+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp");
310 -
311 - fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
312 - fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
313 -diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
314 -index 81cf654..26f9da9 100644
315 ---- a/oss-fuzz/Makefile
316 -+++ b/oss-fuzz/Makefile
317 -@@ -6,8 +6,8 @@
318 - # make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client
319 -
320 - CPPCHECK_DIR=..
321 --INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml -I ${CPPCHECK_DIR}/externals
322 --SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/externals/tinyxml/tinyxml2.cpp ${CPPCHECK_DIR}/lib/*.cpp
323 -+INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals
324 -+SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/lib/*.cpp
325 -
326 - all: oss-fuzz-client translate
327 -
328 -diff --git a/Makefile b/Makefile
329 -index 372647e..9d65717 100644
330 ---- a/Makefile
331 -+++ b/Makefile
332 -@@ -179,8 +179,7 @@ LIBOBJ = $(libcppdir)/analyzerinfo.o \
333 - $(libcppdir)/tokenlist.o \
334 - $(libcppdir)/valueflow.o
335 -
336 --EXTOBJ = externals/simplecpp/simplecpp.o \
337 -- externals/tinyxml/tinyxml2.o
338 -+EXTOBJ = externals/simplecpp/simplecpp.o
339 -
340 - CLIOBJ = cli/cmdlineparser.o \
341 - cli/cppcheckexecutor.o \
342 -@@ -689,9 +688,6 @@ test/testvarid.o: test/testvarid.cpp lib/platform.h lib/config.h lib/settings.h
343 - externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/simplecpp/simplecpp.h
344 - $(CXX) $(CPPFLAGS) $(CFG) $(CXXFLAGS) -w $(UNDEF_STRICT_ANSI) -c -o externals/simplecpp/simplecpp.o externals/simplecpp/simplecpp.cpp
345 -
346 --externals/tinyxml/tinyxml2.o: externals/tinyxml/tinyxml2.cpp externals/tinyxml/tinyxml2.h
347 -- $(CXX) $(CPPFLAGS) $(CFG) $(CXXFLAGS) -w $(UNDEF_STRICT_ANSI) -c -o externals/tinyxml/tinyxml2.o externals/tinyxml/tinyxml2.cpp
348 --
349 - tools/clang-ast.o: tools/clang-ast.cpp
350 - $(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o tools/clang-ast.o tools/clang-ast.cpp
351 -
352 -diff --git a/externals/externals.pri b/externals/externals.pri
353 -index 7f0be8d..b1e94e0 100644
354 ---- a/externals/externals.pri
355 -+++ b/externals/externals.pri
356 -@@ -1,9 +1,6 @@
357 - INCLUDEPATH += $${PWD} \
358 -- $${PWD}/simplecpp \
359 -- $${PWD}/tinyxml
360 -+ $${PWD}/simplecpp
361 -
362 --HEADERS += $${PWD}/simplecpp/simplecpp.h \
363 -- $${PWD}/tinyxml/tinyxml2.h
364 -+HEADERS += $${PWD}/simplecpp/simplecpp.h
365 -
366 --SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
367 -- $${PWD}/tinyxml/tinyxml2.cpp
368 -+SOURCES += $${PWD}/simplecpp/simplecpp.cpp