From f5e7bd29a2a93900dc75398e102d4a1d4077dee9 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Tue, 15 Sep 2015 16:37:57 +0200 Subject: [PATCH] dev-util/cppcheck: Drop old version. Package-Manager: portage-2.2.20.1 --- dev-util/cppcheck/Manifest | 3 - dev-util/cppcheck/cppcheck-1.63-r1.ebuild | 62 ----------- dev-util/cppcheck/cppcheck-1.67.ebuild | 101 ----------------- dev-util/cppcheck/cppcheck-1.68.ebuild | 102 ------------------ dev-util/cppcheck/cppcheck-1.69.ebuild | 102 ------------------ .../cppcheck/files/cppcheck-1.65-c++0x.patch | 9 -- .../files/cppcheck-1.66-tinyxml2.patch | 67 ------------ 7 files changed, 446 deletions(-) delete mode 100644 dev-util/cppcheck/cppcheck-1.63-r1.ebuild delete mode 100644 dev-util/cppcheck/cppcheck-1.67.ebuild delete mode 100644 dev-util/cppcheck/cppcheck-1.68.ebuild delete mode 100644 dev-util/cppcheck/cppcheck-1.69.ebuild delete mode 100644 dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch delete mode 100644 dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest index 02f695ffec97..b8ce7b85ef91 100644 --- a/dev-util/cppcheck/Manifest +++ b/dev-util/cppcheck/Manifest @@ -1,4 +1 @@ -DIST cppcheck-1.63.tar.bz2 1157231 SHA256 924bfc4593215b7bab6b049dbbce9a6f343dbf15f4bdd869ef1d378f09f92064 SHA512 4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508 WHIRLPOOL af095e4f0b84ded78f9fa10baedc5266a66ac52ffa6813eeb38697d1c55e02b76670eb09228c4ce356f2d3402f4247a66fe2ccd666e5637326e0913a75c2732e -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 DIST cppcheck-1.69.tar.bz2 1052984 SHA256 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e SHA512 30f239bcdf4cb1fcc254271bf55f3fdc1ec22e7d26f0704218390cfce1d4cf3ef41f385f4e463ede1a1a401e87d81b1d66a462c7b07e045d46aebd2354384a01 WHIRLPOOL e341c8b8f133fd19188700d53d6f02ab5deffc10fdfedbc9474931596850c10027a91e445998a3884f8f30908581e428fe4c629397b14660a0fe7b852e48b3a4 diff --git a/dev-util/cppcheck/cppcheck-1.63-r1.ebuild b/dev-util/cppcheck/cppcheck-1.63-r1.ebuild deleted file mode 100644 index 3c1d42f4d8a5..000000000000 --- a/dev-util/cppcheck/cppcheck-1.63-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3} ) - -inherit distutils-r1 eutils qt4-r2 toolchain-funcs - -DESCRIPTION="static analyzer of C/C++ code" -HOMEPAGE="http://cppcheck.sourceforge.net" -SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="htmlreport qt4" - -DEPEND="htmlreport? ( ${PYTHON_DEPS} ) - qt4? ( dev-qt/qtgui:4 )" -RDEPEND="${DEPEND}" - -src_configure() { - tc-export CXX - if use qt4 ; then - pushd gui - qt4-r2_src_configure - popd - fi -} - -src_compile() { - emake CFGDIR="/usr/share/${PN}/cfg" - 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_install() { - emake install DESTDIR="${D}" - dodoc readme.txt - insinto "/usr/share/${PN}/cfg" - doins cfg/*.cfg - if use qt4 ; then - dobin gui/${PN}-gui - dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck} - fi - if use htmlreport ; then - pushd htmlreport - distutils-r1_src_install - popd - find "${D}" -name "*.egg-info" -delete - fi -} diff --git a/dev-util/cppcheck/cppcheck-1.67.ebuild b/dev-util/cppcheck/cppcheck-1.67.ebuild deleted file mode 100644 index d17bb4b21ff0..000000000000 --- a/dev-util/cppcheck/cppcheck-1.67.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -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 ~arm ~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}"/${PN}-1.66-tinyxml2.patch - tc-export CXX - emake dmake - ./dmake || die - - epatch "${FILESDIR}"/${PN}-1.65-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() { - # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760 - emake install DESTDIR="${ED}" - - 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.68.ebuild b/dev-util/cppcheck/cppcheck-1.68.ebuild deleted file mode 100644 index f1d83a527fab..000000000000 --- a/dev-util/cppcheck/cppcheck-1.68.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -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 ~arm ~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}"/${PN}-1.66-tinyxml2.patch - tc-export CXX - emake dmake - ./dmake || die - - epatch "${FILESDIR}"/${PN}-1.65-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() { - # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760 - emake install DESTDIR="${ED}" - - 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 - dodoc -r triage -} diff --git a/dev-util/cppcheck/cppcheck-1.69.ebuild b/dev-util/cppcheck/cppcheck-1.69.ebuild deleted file mode 100644 index 13937467ae7d..000000000000 --- a/dev-util/cppcheck/cppcheck-1.69.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -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 ~arm ~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}"/${PN}-1.69-tinyxml2.patch - tc-export CXX - emake dmake - ./dmake || die - - epatch "${FILESDIR}"/${PN}-1.69-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() { - # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760 - emake install DESTDIR="${ED}" - - 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 - dodoc -r triage -} diff --git a/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch b/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch deleted file mode 100644 index 67590d0fee95..000000000000 --- a/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- cppcheck-1.65/gui/gui.pro -+++ cppcheck-1.65/gui/gui.pro -@@ -150,6 +150,4 @@ - LIBS += -lshlwapi - } - --contains(QMAKE_CC, gcc) { - QMAKE_CXXFLAGS += -std=c++0x --} diff --git a/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch deleted file mode 100644 index 1417ea321d7d..000000000000 --- a/dev-util/cppcheck/files/cppcheck-1.66-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"; -@@ -401,10 +401,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 tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n"; -+ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.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