From 578b5144d472b569b4d9bf12e1ca02c77de72ab4 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Fri, 27 Feb 2015 10:26:48 +0000 Subject: [PATCH] Version bump (bug 524674, thanks Christian Strahl). Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x62EEF090 --- dev-util/cppcheck/ChangeLog | 9 +- dev-util/cppcheck/Manifest | 17 ++-- dev-util/cppcheck/cppcheck-1.65-r1.ebuild | 99 ------------------- ...check-1.66.ebuild => cppcheck-1.68.ebuild} | 7 +- .../files/cppcheck-1.65-tinyxml2.patch | 67 ------------- 5 files changed, 19 insertions(+), 180 deletions(-) delete mode 100644 dev-util/cppcheck/cppcheck-1.65-r1.ebuild rename dev-util/cppcheck/{cppcheck-1.66.ebuild => cppcheck-1.68.ebuild} (93%) delete mode 100644 dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog index 2b4e4aa0a27a..a71184db69f5 100644 --- a/dev-util/cppcheck/ChangeLog +++ b/dev-util/cppcheck/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/cppcheck # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.61 2015/02/27 10:14:25 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.62 2015/02/27 10:26:42 xmw Exp $ + +*cppcheck-1.68 (27 Feb 2015) + + 27 Feb 2015; Michael Weber +cppcheck-1.68.ebuild, + -cppcheck-1.65-r1.ebuild, -cppcheck-1.66.ebuild, + -files/cppcheck-1.65-tinyxml2.patch: + Version bump (bug 524674, thanks Christian Strahl). 27 Feb 2015; Michael Weber cppcheck-1.66.ebuild, cppcheck-1.67.ebuild: diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest index 9814b58d8621..b0e32049569c 100644 --- a/dev-util/cppcheck/Manifest +++ b/dev-util/cppcheck/Manifest @@ -2,24 +2,21 @@ Hash: SHA256 AUX cppcheck-1.65-c++0x.patch 172 SHA256 2b0256f2c31c6484da31fe1c40dd2c83bd48542b26bbeb99e79cc01f514ed12a SHA512 d04371d8919a0ce2448153de4a8438c8e2064b3353682d7499ab6222a7e66411ec85e6ed22640e3b4c0cb6d7f628bd5fa1b368c153e3d00e4e8ad90a88c0990a WHIRLPOOL 643c65f3f94da39bc9872ed6bfdad015631c3baa46e4b1e16668ac9a3ff5fcde48b550492644714274611d10ecb981b5979517343a50da185477e79fe2b86213 -AUX cppcheck-1.65-tinyxml2.patch 3355 SHA256 38394e1ff82823c4c1fd5995f1e3c41dfb8202838ed4b695654dfde7044cc36e SHA512 69c5fd9908576483e19e8edfc42aadd8c51d188ece88e30d1be34335adfa28bd9e9296ed1adb28107e7538e519eb35c4b195c149eb578b6c83651edc1d38a4e2 WHIRLPOOL 4288e978feefe08ea68944b27bbe87c751b825cd7a9aa436e42b3cd0b9283d6d028e674667ec20de724c92da261348015aaea63a33c07a813401fc599920c6ef AUX cppcheck-1.66-tinyxml2.patch 3375 SHA256 691d1628ee0574c7ab79991da48056cdc9396bc6616b1cf4149e1edcb9ee0b53 SHA512 4de1f9d6a537f3378493782d2893cfaf3345fb86d1f3ad26cfdb7abd0d3f3be5ebc10bfd9450d639565b825eac45669a58e0a8b798eb45a134524445fd6acd5b WHIRLPOOL 1c66b38f745719352c946f9446692dbc094a64a158adf74708b0af2beb554f64c0bc82e56fd7313e0c4f25a75fbd93ff26730a364a9fe15658ba6371f4e03041 DIST cppcheck-1.63.tar.bz2 1157231 SHA256 924bfc4593215b7bab6b049dbbce9a6f343dbf15f4bdd869ef1d378f09f92064 SHA512 4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508 WHIRLPOOL af095e4f0b84ded78f9fa10baedc5266a66ac52ffa6813eeb38697d1c55e02b76670eb09228c4ce356f2d3402f4247a66fe2ccd666e5637326e0913a75c2732e -DIST cppcheck-1.65.tar.bz2 1227353 SHA256 16577a2423ad6cbb7506e1b4032172b0b27d65b8a4174fb0c671472f37b65d67 SHA512 ce1ef2771470383e33e159b99ce5bcf1c7f570c7a539d9488bf771a5d23b4511acd7ad7e14b839e5433f47032f4d662b6c053579d4e353caf7bf22588e1d2916 WHIRLPOOL 5101d970f7d8ad19c3dea4f0d95713fe9c8afd3ac3f7bde04cf51c11ecbecfe4fc97f57c780408a15af0ef4e5a0bf4aa7780bd994bc59548c91efaee6cf80edb -DIST cppcheck-1.66.tar.bz2 1064369 SHA256 9469c23d39df5f03301fb0f9c29d75e9d63ed80d486cc6633145e3c95293c1b7 SHA512 de61b64f9085244a0f8c511ffe19e5ef18b6ff0274a3317328f72178f92843171c1e3ca7e60d496504703c7ec4f6e458247b1a3f16c371de6a2eb21b1b41d305 WHIRLPOOL 2b1fb4c1bff14153c36d52a2c1b60f3bbe93e0bedc3bff71e65aa73bb3c343e2f2db8c86f24e2ba9d227513d0a0fe627ee92858e782a63ec1b03ea285252b6f4 DIST cppcheck-1.67.tar.bz2 1084926 SHA256 6214c0cf0c11c83ecfae35f8cc8db4fa47389a77360919653d635612cefe2ab9 SHA512 5d1e3e12c818f850b00a8e3b3d79f24fceb0fa806d9100aaa6aed1bbbc86237af2e7dd4567fdfd227281f62d4b5450ac6cbbc6a97e04b380c242c59ddd3609ef WHIRLPOOL 1fc82744a78b76d9bb682fa6f6d8a619164c5cb250eb199ac545d4c147522ab5c4961d635cdea291ccf65f7972a162d394c4e500542b27b8679e262093e86884 +DIST cppcheck-1.68.tar.bz2 1008321 SHA256 add6e5e12b05ca02b356cd0ec7420ae0dcafddeaef183b4dfbdef59c617349b1 SHA512 72c78a17281ad3d771459895ad776c5dceda605edef13886e870cff456db5dc5cbff39d56bdf39788283bf673dd28a13b1602a330b8e33a3042b07cf43f0f011 WHIRLPOOL 16d8d4deeef9ec9fb4415c5941935122ebf3a44159ac8251ebfbfca2aeeb270bccaed5dcf63f6018b3fcf79cad6779af76d0e1cba47e853394794be4942cd622 EBUILD cppcheck-1.63-r1.ebuild 1265 SHA256 f0ca59d93e38c58c2e868a5d1a1756b90bb5a1fea87b6eb18155a178ac69ce7b SHA512 d29f1ea7d5375240b5e169972deeec21927b2176a63b43d168b308cf2a4ff355f0ac77a24610b11026ed7bb7a939c9b1c03f85bbce4e010e6de387bc06d60084 WHIRLPOOL c0598a62d663abc462b3d2a5f78b0c95fc1aa90c54544dd813e0a7ac255b9f918e963c1f9d8634e31c1767426f796a88b80cc1a3d522153b35a84653edec71b3 -EBUILD cppcheck-1.65-r1.ebuild 2164 SHA256 43957596749e8018118c44da173e2e54774030915bfb1b43a5038a3fd6c0b256 SHA512 3b8313a9793391dfc36c4a4bf409e9b9cedb5d04ee78098d985b3edebb08ad9fb500357c3ab486950f075feeed0cff1bec544fcff8c3d7eb91953bf7f45393df WHIRLPOOL fb80f6986c64a220840944da7497a30bafb56a0a86305da37d1553761a8540a0e5b3b20ae4b5275cc00ae6d04e68f68f2a990f31f96543a5c5a5734540e91315 -EBUILD cppcheck-1.66.ebuild 2242 SHA256 6247be5a4795d4aca154021eb66967466e0c1a6c59bde76103b543d8a51d30b9 SHA512 bb5f9c31a46dc8b7de56bf042a5a4d1029d4312a18acbfff0985b77d98c0dc7d1398a47f307e0f0fd6dffcf3d7f6c424177990ea4f898d32014cb939157982f3 WHIRLPOOL b37bf5e445ada645acfb672170b342627e7d3bee8a62bffdb2cecd43a26cceee367a6e7dbae1a03ad668f8cb7303b8d7486d4d279cf3150ff6b0b05bad3e05b6 EBUILD cppcheck-1.67.ebuild 2253 SHA256 bf3cf8103b2697c30d2b2a6e1a1cd2773187e2d589987fa010ca5598c7658d1b SHA512 1d01814057ed76b639c4d017f84af4a52e750baf3e6ce9f69f6b9790416d7bcf35bbf22b669320ab2b787cf2ee7b264147e6fc880fd864588a343c362b30a98d WHIRLPOOL 7d2eed7e26266aeb65f3cd2a415f805b0c730d9aef2e831774793907f04ca5bf7a1b6e13ddb00354e4a5e6e04a9c427f8b8df075adbda6adb3f16c520c2f8a43 -MISC ChangeLog 9768 SHA256 c9dd96cd3584b91cfe6aa542e84086475a4a8a8780f054fac7869f30b42afe7f SHA512 b736ecfbd8d867cc610650a5e78ae6a93de1c96d3dee484b0503dc84e79a62a0be552f9b1a02ff1f5edd8baa55f74852f9b17065e2d07bae4f4c61aeb847fe53 WHIRLPOOL 245dfacacd60388f65b02c5b9bcfb1aa5db3eea13c12963e9039f255b6953a459a1b88032d453604d5ffde46b1d28afe408bf3abc0eded32897a133356a53d56 +EBUILD cppcheck-1.68.ebuild 2270 SHA256 c8a30d20019aeed349e2155be6679ada31613d0636c322221646bb12823b0ef0 SHA512 0500ee525bbeaacccb0713089b95491d2bba2c1efb36082e720f3ac58147089211d1ca301fabe2f42741ba8c7b45b5fc9c07e52695d32d7a99f30bb7818763b5 WHIRLPOOL 275d590d3e33ae36a0c9a355a6af52877cc33180f0b5199774cf843d3e32625b3fa32d288d7d21718c3e86eb021813ed32366c82d716ba45fa02dbb420cafb34 +MISC ChangeLog 10013 SHA256 b113c675731c17ed6aa94f96eeb6a54037020ebbafae8e609098886acd36880d SHA512 ab68dd8b25d57de24ba84ad709f05c7ead1a9c9fb6c0cbebcee3af9d06a8717e9648df2c0da86df061693a0c8eb22445d86764931bbc37469173131cd898e942 WHIRLPOOL eacbec053534e3828f0a348d636ccdd677d7d0b798bd25bd878cc52027ccb05b2273822e0bdcfd2a656247a526863b177556389a43a802c14bdd344dc91941ca MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iL4EAREIAGYFAlTwQ4ZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +iL4EAREIAGYFAlTwRmdfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky -N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JB0BAEAi0cfk6Lp5BidjV6t5PuaaOPP -G+dYx+2RNxywSLEilBMBAJTN8tqtblTNKfLAuynnsYJzASJJw79x4T0smtShUe+h -=psAf +N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JCtEAD9FSqzqakwkq2ymKfLkCKKOfzw +QyReBihunvNj2zH361gA/15cMuYMujfA5JMSP8g+aTzRLWEneUqCBxU3RNZEAj15 +=Qlj0 -----END PGP SIGNATURE----- diff --git a/dev-util/cppcheck/cppcheck-1.65-r1.ebuild b/dev-util/cppcheck/cppcheck-1.65-r1.ebuild deleted file mode 100644 index 1c31f01f613e..000000000000 --- a/dev-util/cppcheck/cppcheck-1.65-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild,v 1.3 2014/10/10 13:23:54 xmw Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) - -inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs - -DESCRIPTION="static analyzer of C/C++ code" -HOMEPAGE="http://cppcheck.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="htmlreport pcre qt4" - -RDEPEND="htmlreport? ( ${PYTHON_DEPS} ) - >=dev-libs/tinyxml2-2 - qt4? ( dev-qt/qtgui:4 ) - pcre? ( dev-libs/libpcre )" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - virtual/pkgconfig" - -src_prepare() { - # Drop bundled libs, patch Makefile generator and re-run it - rm -r externals || die - epatch "${FILESDIR}"/${P}-tinyxml2.patch - tc-export CXX - emake dmake - ./dmake || die - - epatch "${FILESDIR}"/${P}-c++0x.patch -} - -src_configure() { - if use pcre ; then - sed -e '/HAVE_RULES=/s:=no:=yes:' \ - -i Makefile - fi - if use qt4 ; then - pushd gui - qt4-r2_src_configure - popd - fi -} - -src_compile() { - export LIBS="$(pkg-config --libs tinyxml2)" - emake ${PN} man \ - CFGDIR="${EROOT}usr/share/${PN}/cfg" \ - DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl" - - if use qt4 ; then - pushd gui - qt4-r2_src_compile - popd - fi - if use htmlreport ; then - pushd htmlreport - distutils-r1_src_compile - popd - fi -} - -src_test() { - # safe final version - mv -v ${PN}{,.final} - mv -v lib/library.o{,.final} - mv -v cli/cppcheckexecutor.o{,.final} - #trigger recompile with CFGDIR inside ${S} - emake check CFGDIR="${S}/cfg" - # restore - mv -v ${PN}{.final,} - mv -v lib/library.o{.final,} - mv -v cli/cppcheckexecutor.o{.final,} -} - -src_install() { - emake install DESTDIR="${D}" - insinto "/usr/share/${PN}/cfg" - doins cfg/*.cfg - if use qt4 ; then - dobin gui/${PN}-gui - dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}} - fi - if use htmlreport ; then - pushd htmlreport - distutils-r1_src_install - popd - find "${D}" -name "*.egg-info" -delete - fi - doman ${PN}.1 - dodoc readme.txt -} diff --git a/dev-util/cppcheck/cppcheck-1.66.ebuild b/dev-util/cppcheck/cppcheck-1.68.ebuild similarity index 93% rename from dev-util/cppcheck/cppcheck-1.66.ebuild rename to dev-util/cppcheck/cppcheck-1.68.ebuild index 71aaebb74a67..286959dba481 100644 --- a/dev-util/cppcheck/cppcheck-1.66.ebuild +++ b/dev-util/cppcheck/cppcheck-1.68.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.66.ebuild,v 1.3 2015/02/27 10:14:25 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.68.ebuild,v 1.1 2015/02/27 10:26:42 xmw Exp $ EAPI=5 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="htmlreport pcre qt4" RDEPEND="htmlreport? ( ${PYTHON_DEPS} ) @@ -29,7 +29,7 @@ DEPEND="${RDEPEND} src_prepare() { # Drop bundled libs, patch Makefile generator and re-run it rm -r externals || die - epatch "${FILESDIR}"/${P}-tinyxml2.patch + epatch "${FILESDIR}"/${PN}-1.66-tinyxml2.patch tc-export CXX emake dmake ./dmake || die @@ -98,4 +98,5 @@ src_install() { fi doman ${PN}.1 dodoc readme.txt + dodoc -r triage } diff --git a/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch deleted file mode 100644 index cb5a4ae401e2..000000000000 --- a/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- cppcheck-1.65/tools/dmake.cpp -+++ cppcheck-1.65/tools/dmake.cpp -@@ -170,7 +170,6 @@ - } - - std::vector externalfiles; -- getCppFiles(externalfiles, "externals/"); - - - // QMAKE - lib/lib.pri -@@ -179,10 +178,6 @@ - if (fout1.is_open()) { - fout1 << "# no manual edits - this file is autogenerated by dmake\n\n"; - fout1 << "include($$PWD/pcrerules.pri)\n"; -- fout1 << "BASEPATH = ../externals/tinyxml/\n"; -- fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n"; -- fout1 << "BASEPATH = ../lib/\n"; -- fout1 << "INCLUDEPATH += ../externals/tinyxml\n"; - fout1 << "HEADERS += $${BASEPATH}check.h \\\n"; - for (unsigned int i = 0; i < libfiles.size(); ++i) { - std::string fname(libfiles[i].substr(4)); -@@ -208,7 +203,6 @@ - std::ofstream fout1("test/testfiles.pri"); - if (fout1.is_open()) { - fout1 << "# no manual edits - this file is autogenerated by dmake\n\n"; -- fout1 << "INCLUDEPATH += ../externals/tinyxml\n"; - fout1 << "\n\nSOURCES += "; - for (unsigned int i = 0; i < testfiles.size(); ++i) { - const std::string filename(testfiles[i].substr(5)); -@@ -354,9 +348,9 @@ - - makeConditionalVariable(fout, "CXX", "g++"); - makeConditionalVariable(fout, "PREFIX", "/usr"); -- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml"); -- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml"); -- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib"); -+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli"); - - fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n"; - fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n"; -@@ -394,10 +388,10 @@ - fout << "dmake:\ttools/dmake.o cli/filelister.o lib/path.o\n"; - fout << "\t$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n"; - fout << "\t./dmake\n\n"; -- fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n"; -- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n"; -+ fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n"; -+ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n"; - fout << "clean:\n"; -- fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n"; -+ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n"; - fout << "man:\tman/cppcheck.1\n\n"; - fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n"; - fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n"; ---- cppcheck-1.65/gui/gui.pro -+++ cppcheck-1.65/gui/gui.pro -@@ -15,7 +15,7 @@ - LIBS += -l../bin/cppcheck-core - DEFINES += CPPCHECKLIB_IMPORT - } --LIBS += -L../externals -+LIBS += `pkg-config --libs tinyxml2` - - DESTDIR = . - RCC_DIR = temp -- 2.26.2