diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-10-10 06:31:14 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-10-10 06:31:14 +0000 |
| commit | abb7f702d64003e15c90cf96e2bb609c0151c9e5 (patch) | |
| tree | 123f3d091ea7959b123179037bdfa62f2006cc46 /dev-util/cppcheck | |
| parent | bump as maintainer request, bug 524766 (diff) | |
| download | gentoo-2-abb7f702d64003e15c90cf96e2bb609c0151c9e5.tar.gz gentoo-2-abb7f702d64003e15c90cf96e2bb609c0151c9e5.tar.bz2 gentoo-2-abb7f702d64003e15c90cf96e2bb609c0151c9e5.zip | |
Properly name patch. Remove old.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-util/cppcheck')
| -rw-r--r-- | dev-util/cppcheck/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/cppcheck/cppcheck-1.65-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/cppcheck/files/cppcheck-1.64-tinyxml2.patch | 30 | ||||
| -rw-r--r-- | dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch (renamed from dev-util/cppcheck/files/cppcheck-1.65-r1-tinyxml2.patch) | 0 |
4 files changed, 8 insertions, 33 deletions
diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog index fea56e16ec44..5de81c21bf3d 100644 --- a/dev-util/cppcheck/ChangeLog +++ b/dev-util/cppcheck/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/cppcheck # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.54 2014/10/09 23:53:08 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.55 2014/10/10 06:31:14 jer Exp $ + + 10 Oct 2014; Jeroen Roovers <jer@gentoo.org> cppcheck-1.65-r1.ebuild, + -files/cppcheck-1.64-tinyxml2.patch, -files/cppcheck-1.65-r1-tinyxml2.patch, + +files/cppcheck-1.65-tinyxml2.patch: + Properly name patch. Remove old. 09 Oct 2014; Michael Weber <xmw@gentoo.org> -cppcheck-1.64.ebuild, -cppcheck-1.65.ebuild, -files/cppcheck-1.65-tinyxml2.patch: diff --git a/dev-util/cppcheck/cppcheck-1.65-r1.ebuild b/dev-util/cppcheck/cppcheck-1.65-r1.ebuild index 089efb8ec4a1..d76216bb5289 100644 --- a/dev-util/cppcheck/cppcheck-1.65-r1.ebuild +++ b/dev-util/cppcheck/cppcheck-1.65-r1.ebuild @@ -1,6 +1,6 @@ # 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.1 2014/10/09 23:16:33 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild,v 1.2 2014/10/10 06:31:14 jer Exp $ EAPI=5 @@ -26,7 +26,7 @@ DEPEND="${RDEPEND} src_prepare() { # Drop bundled libs, patch Makefile generator and re-run it rm -r externals || die - epatch "${FILESDIR}"/${PF}-tinyxml2.patch + epatch "${FILESDIR}"/${P}-tinyxml2.patch emake dmake \ CPPFLAGS="${CPPFLAGS}" \ CXX="$(tc-getCXX)" \ diff --git a/dev-util/cppcheck/files/cppcheck-1.64-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.64-tinyxml2.patch deleted file mode 100644 index e694efa95458..000000000000 --- a/dev-util/cppcheck/files/cppcheck-1.64-tinyxml2.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -81,15 +81,15 @@ - endif - - ifndef INCLUDE_FOR_LIB -- INCLUDE_FOR_LIB=-Ilib -Iexternals -Iexternals/tinyxml -+ INCLUDE_FOR_LIB=-Ilib - endif - - ifndef INCLUDE_FOR_CLI -- INCLUDE_FOR_CLI=-Ilib -Iexternals -Iexternals/tinyxml -+ INCLUDE_FOR_CLI=-Ilib - endif - - ifndef INCLUDE_FOR_TEST -- INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals -Iexternals/tinyxml -+ INCLUDE_FOR_TEST=-Ilib -Icli - endif - - BIN=$(DESTDIR)$(PREFIX)/bin -@@ -226,7 +226,7 @@ - $(CXX) -std=c++0x -o dmake tools/dmake.cpp cli/filelister.cpp lib/path.cpp -Ilib $(LDFLAGS) - - reduce: tools/reduce.cpp -- $(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml lib/*.cpp externals/tinyxml/tinyxml2.cpp -+ $(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib lib/*.cpp - - clean: - rm -f build/*.o lib/*.o cli/*.o test/*.o externals/tinyxml/*.o testrunner reduce cppcheck cppcheck.1 diff --git a/dev-util/cppcheck/files/cppcheck-1.65-r1-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch index cb5a4ae401e2..cb5a4ae401e2 100644 --- a/dev-util/cppcheck/files/cppcheck-1.65-r1-tinyxml2.patch +++ b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch |