Version bump, update HOMEPAGE

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

9 files changed, 79 insertions, 190 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index ebc05b1faf3f..7b46c9952240 100644
--- a/dev-util/cppcheck/ChangeLog
+++ b/dev-util/cppcheck/ChangeLog
@@ -1,6 +1,14 @@
 # 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.51 2014/04/26 18:55:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.52 2014/05/19 15:50:29 xmw Exp $
+
+*cppcheck-1.65 (19 May 2014)
+
+  19 May 2014; Michael Weber <xmw@gentoo.org> +cppcheck-1.65.ebuild,
+  +files/cppcheck-1.65-c++0x.patch, +files/cppcheck-1.65-tinyxml2.patch,
+  -cppcheck-1.59-r1.ebuild, -cppcheck-1.60.1.ebuild, -cppcheck-1.61.ebuild,
+  -cppcheck-1.62.ebuild, cppcheck-1.63-r1.ebuild, cppcheck-1.64.ebuild:
+  Version bump, update HOMEPAGE
 
   26 Apr 2014; Agostino Sarubbo <ago@gentoo.org> cppcheck-1.63-r1.ebuild:
   Stable for x86, wrt bug #502804
diff --git a/dev-util/cppcheck/cppcheck-1.59-r1.ebuild b/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
deleted file mode 100644
index 759a753879d8..000000000000
--- a/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.59-r1.ebuild,v 1.3 2013/09/05 18:40:37 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-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
-	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
-	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.60.1.ebuild b/dev-util/cppcheck/cppcheck-1.60.1.ebuild
deleted file mode 100644
index ad53eead2a98..000000000000
--- a/dev-util/cppcheck/cppcheck-1.60.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.60.1.ebuild,v 1.2 2013/09/05 18:40:37 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-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
-	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
-	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.61.ebuild b/dev-util/cppcheck/cppcheck-1.61.ebuild
deleted file mode 100644
index c49469e154ec..000000000000
--- a/dev-util/cppcheck/cppcheck-1.61.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.61.ebuild,v 1.1 2013/12/03 08:53:50 xmw Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
-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
-	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
-	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.63-r1.ebuild b/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
index 6a7c3eceed27..c844d6faa0c3 100644
--- a/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.63-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.63-r1.ebuild,v 1.3 2014/04/26 18:55:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.63-r1.ebuild,v 1.4 2014/05/19 15:50:29 xmw Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1 eutils qt4-r2 toolchain-funcs
 
 DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
+HOMEPAGE="http://cppcheck.sourceforge.net"
 SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/dev-util/cppcheck/cppcheck-1.64.ebuild b/dev-util/cppcheck/cppcheck-1.64.ebuild
index 934ffe7a9bf7..5b7ac0bf36b5 100644
--- a/dev-util/cppcheck/cppcheck-1.64.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.64.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.64.ebuild,v 1.1 2014/03/30 16:53:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.64.ebuild,v 1.2 2014/05/19 15:50:29 xmw Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1 eutils qt4-r2 toolchain-funcs
 
 DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
+HOMEPAGE="http://cppcheck.sourceforge.net"
 SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/dev-util/cppcheck/cppcheck-1.62.ebuild b/dev-util/cppcheck/cppcheck-1.65.ebuild
index 59e7932519e5..0a6375ac3d4c 100644
--- a/dev-util/cppcheck/cppcheck-1.62.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.65.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.62.ebuild,v 1.3 2014/01/14 13:59:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.65.ebuild,v 1.1 2014/05/19 15:50:29 xmw Exp $
 
 EAPI=5
 
@@ -9,18 +9,26 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1 eutils qt4-r2 toolchain-funcs
 
 DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
+HOMEPAGE="http://cppcheck.sourceforge.net"
 SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="htmlreport qt4"
 
 DEPEND="htmlreport? ( ${PYTHON_DEPS} )
+	>=dev-libs/tinyxml2-2
 	qt4? ( dev-qt/qtgui:4 )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	# Do not use bundled tinyxml2
+	epatch \
+		"${FILESDIR}"/${P}-tinyxml2.patch \
+		"${FILESDIR}"/${P}-c++0x.patch
+}
+
 src_configure() {
 	tc-export CXX
 	if use qt4 ; then
@@ -31,7 +39,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	emake CFLAGS="${CFLAGS}" \
+		CFGDIR="/usr/share/${PN}/cfg" \
+		TINYXML="-ltinyxml2"
 	if use qt4 ; then
 		pushd gui
 		qt4-r2_src_compile
@@ -44,9 +54,15 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	emake TINYXML="-ltinyxml2" check
+}
+
 src_install() {
-	emake install DESTDIR="${D}"
+	emake install DESTDIR="${D}" TINYXML="-ltinyxml2"
 	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}
diff --git a/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch b/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch
new file mode 100644
index 000000000000..67590d0fee95
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch
@@ -0,0 +1,9 @@
+--- 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.65-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch
new file mode 100644
index 000000000000..61776933578d
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.65-tinyxml2.patch
@@ -0,0 +1,36 @@
+--- cppcheck-1.65/Makefile
++++ cppcheck-1.65/Makefile
+@@ -94,15 +94,15 @@
+ endif
+ 
+ ifndef INCLUDE_FOR_LIB
+-    INCLUDE_FOR_LIB=-Ilib -Iexternals/tinyxml
++    INCLUDE_FOR_LIB=-Ilib
+ endif
+ 
+ ifndef INCLUDE_FOR_CLI
+-    INCLUDE_FOR_CLI=-Ilib -Iexternals/tinyxml
++    INCLUDE_FOR_CLI=-Ilib
+ endif
+ 
+ ifndef INCLUDE_FOR_TEST
+-    INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals/tinyxml
++    INCLUDE_FOR_TEST=-Ilib -Icli
+ endif
+ 
+ BIN=$(DESTDIR)$(PREFIX)/bin
+@@ -242,11 +242,11 @@
+ 	$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)
+ 	./dmake
+ 
+-reduce:	tools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)
++reduce:	tools/reduce.o $(LIBOBJ)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)
+ 
+ clean:
+-	rm -f build/*.o lib/*.o cli/*.o test/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1
++	rm -f build/*.o lib/*.o cli/*.o test/*.o testrunner reduce dmake cppcheck cppcheck.1
+ 
+ man:	man/cppcheck.1
+