[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/

[Michael Weber]

commit:     77f63475d8ab174a29107809ac1be1203717333c
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 22:34:02 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 22:34:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f63475

dev-util/cppcheck: Remove old versions.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-util/cppcheck/Manifest                         |   2 -
 dev-util/cppcheck/cppcheck-1.72.ebuild             | 105 ---------------------
 dev-util/cppcheck/cppcheck-1.75.ebuild             | 104 --------------------
 .../cppcheck/files/cppcheck-1.72-tinyxml2.patch    |  66 -------------
 4 files changed, 277 deletions(-)

diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 3d83dd57558..32c7ec74e29 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,4 +1,2 @@
-DIST cppcheck-1.72.tar.bz2 1125775 SHA256 9460b184ff2d8dd15344f3e2f42f634c86e4dd3303e1e9b3f13dc67536aab420 SHA512 13b2348c97a3777feaad579f8620f18d90f6f934f92f5db712c7190af1f40042527500aefa4c8ccd348f7691b1c0d5f32115085c9385dec55460d5ba0804a410 WHIRLPOOL 790514f4b5b9c539a30daa691d268c6c5f1077743cde1af8834248eb4213224275e9f72cea46f3b378119a3d0944d7e8d63270c0cd47517c7f382c683a1938fe
-DIST cppcheck-1.75.tar.bz2 1152511 SHA256 57c70043c1330ed915cbd1a17ecc5408f2637a05062970508e990b1ba28760a0 SHA512 74116a7a2cd1c8c9a06c81f3f4de3de281f24ee30692729de5506dc7572ed694e55c32d1ad72196a9b95005e9f8d749bd82655323f8ff56051997c2ffc4ed57f WHIRLPOOL a42979e35041d382b1df755b0cdfb4c51951388d2b097856fa08b3ca6b39bdd99a13809a8b514b1fc0502ac0183a08e0f1ed742100e38a14ee2f7337ddda1f01
 DIST cppcheck-1.77.tar.bz2 1188453 SHA256 1980ffe5c9c24bb6dea24514d42be3aa49d6ba7cc26c448b3543611fe8ba2619 SHA512 df8dddf7758c342d45b3393246e07eaa11a53dca19e8a0d09de04f12ea6232538941328d9ca9ac52eb425871fd1c49d55c77e6e38b40772b6f856fd1e9e99779 WHIRLPOOL 9f7842eba0f53a999993dbd23d09c10e5bd3dcca5ecbb0689e4ded8c7529d84fd939a57ce9cd267cdd21b2d79aeb6c07d672983ccb52be0fcc0b28ca80a31b59
 DIST cppcheck-1.78.tar.bz2 1201959 SHA256 e42696f7d6321b98cb479ad9728d051effe543b26aca8102428f60b9850786b1 SHA512 598556e9d657a3a77ff889cb6647291160017f7f9322326771416ff59d44126ce47c39767657b863cdb8a1b46d7c83bb337ec2fe0574500b37e99c33377b5dd8 WHIRLPOOL 2087ad837353d01bca828af940c427909a3e556e97e46d1822e0f2f527619c87b15d1a7f647992dd46eb3a2ef1eb4fb86344db31d7a01fb6f8a9070dfeecef96

diff --git a/dev-util/cppcheck/cppcheck-1.72.ebuild b/dev-util/cppcheck/cppcheck-1.72.ebuild
deleted file mode 100644
index 0f4dcbf95d9..00000000000
--- a/dev-util/cppcheck/cppcheck-1.72.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
-
-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? ( dev-python/pygments[${PYTHON_USEDEP}] )
-	>=dev-libs/tinyxml2-2
-	<dev-libs/tinyxml2-4
-	qt4? ( dev-qt/qtgui:4 )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-src_prepare() {
-	append-cxxflags -std=c++0x
-
-	# Drop bundled libs, patch Makefile generator and re-run it
-	rm -r externals || die
-	epatch "${FILESDIR}"/${PN}-1.72-tinyxml2.patch
-	tc-export CXX
-	emake dmake
-	./dmake || die
-
-	epatch_user
-}
-
-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 gui/{projectfile.txt,gui.${PN}}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_install
-		popd
-		find "${D}" -name "*.egg-info" -delete
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
-	fi
-	doman ${PN}.1
-	dodoc -r triage
-}

diff --git a/dev-util/cppcheck/cppcheck-1.75.ebuild b/dev-util/cppcheck/cppcheck-1.75.ebuild
deleted file mode 100644
index ab82e77f822..00000000000
--- a/dev-util/cppcheck/cppcheck-1.75.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
-
-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? ( dev-python/pygments[${PYTHON_USEDEP}] )
-	>=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() {
-	append-cxxflags -std=c++0x
-
-	# Drop bundled libs, patch Makefile generator and re-run it
-	rm -r externals/tinyxml || die
-	epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
-	tc-export CXX
-	emake dmake
-	./dmake || die
-
-	epatch_user
-}
-
-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 gui/{projectfile.txt,gui.${PN}}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport
-		distutils-r1_src_install
-		popd
-		find "${D}" -name "*.egg-info" -delete
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
-	fi
-	doman ${PN}.1
-	dodoc -r triage
-}

diff --git a/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
deleted file mode 100644
index 478f1feed16..00000000000
--- a/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- cppcheck-1.71/gui/gui.pro
-+++ cppcheck-1.71/gui/gui.pro
-@@ -14,7 +14,7 @@
-     LIBS += -l../bin/cppcheck-core
-     DEFINES += CPPCHECKLIB_IMPORT
- }
--LIBS += -L$$PWD/../externals
-+LIBS += `pkg-config --libs tinyxml2`
- 
- DESTDIR = .
- RCC_DIR = temp
---- cppcheck-1.72/tools/dmake.cpp
-+++ cppcheck-1.72/tools/dmake.cpp
-@@ -174,7 +174,6 @@
-     }
- 
-     std::vector<std::string> externalfiles;
--    getCppFiles(externalfiles, "externals/", true);
- 
- 
-     // QMAKE - lib/lib.pri
-@@ -183,8 +182,7 @@
-         if (fout1.is_open()) {
-             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
-             fout1 << "include($$PWD/pcrerules.pri)\n";
--            fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
--            fout1 << "INCLUDEPATH += $$PWD $$PWD/../externals/tinyxml\n";
-+            fout1 << "INCLUDEPATH += $$PWD\n";
-             fout1 << "HEADERS += $${PWD}/check.h \\\n";
-             for (unsigned int i = 0; i < libfiles.size(); ++i) {
-                 std::string fname(libfiles[i].substr(4));
-@@ -210,7 +208,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));
-@@ -375,9 +372,9 @@
-          << "endif\n\n";
- 
-     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";
-@@ -418,10 +415,10 @@
-     fout << "\t$(CXX) $(CXXFLAGS) -o dmake tools/dmake.o cli/filelister.o cli/pathmatch.o lib/path.o -Ilib $(LDFLAGS)\n\n";
-     fout << "run-dmake: dmake\n";
-     fout << "\t./dmake\n\n";
--    fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
--    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -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) -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";