Version bump as requested by Christian Strahl (bug 473182)

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

3 files changed, 67 insertions, 81 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index 66ec84e76e49..a78396f3fd18 100644
--- a/dev-util/cppcheck/ChangeLog
+++ b/dev-util/cppcheck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cppcheck
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.40 2013/05/28 21:49:32 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.41 2013/06/13 13:14:53 xmw Exp $
+
+*cppcheck-1.60.1 (13 Jun 2013)
+
+  13 Jun 2013; Michael Weber <xmw@gentoo.org> +cppcheck-1.60.1.ebuild,
+  -cppcheck-1.59.ebuild:
+  Version bump as requested by Christian Strahl (bug 473182)
 
   28 May 2013; Michael Weber <xmw@gentoo.org> cppcheck-1.59-r1.ebuild:
   remove useless egg-info files (bug 471474 by Nikoli)
diff --git a/dev-util/cppcheck/cppcheck-1.59.ebuild b/dev-util/cppcheck/cppcheck-1.59.ebuild
deleted file mode 100644
index 763e291ec079..000000000000
--- a/dev-util/cppcheck/cppcheck-1.59.ebuild
+++ /dev/null
@@ -1,80 +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.ebuild,v 1.1 2013/04/08 07:43:40 xmw Exp $
-
-EAPI="3"
-PYTHON_DEPEND="htmlreport? 2"
-
-inherit distutils 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? ( dev-python/pygments )
-	qt4? ( dev-qt/qtgui:4 )"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_SETUP_FILES=("htmlreport|setup.py")
-
-pkg_setup() {
-	if use htmlreport ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if use htmlreport ; then
-		pushd htmlreport
-		python_convert_shebangs -r 2 .
-		distutils_src_prepare
-		popd
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	emake || die
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_compile
-		popd
-	fi
-	use htmlreport && distutils_src_compile
-	#https://sourceforge.net/apps/trac/cppcheck/ticket/4149
-	#$(tc-getCXX) ${CFLAGS} ${LDFLAGS} -o ${PN}-democlient.cgi \
-	#	democlient.cpp -I../lib democlient.cpp
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc readme.txt || die
-	if use qt4 ; then
-		dobin gui/${PN}-gui || die
-		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck} || die
-	fi
-	use htmlreport && distutils_src_install
-	#dobin ${PN}-democlient.cgi
-}
-
-pkg_postinst() {
-	use htmlreport && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use htmlreport && distutils_pkg_postrm
-}
diff --git a/dev-util/cppcheck/cppcheck-1.60.1.ebuild b/dev-util/cppcheck/cppcheck-1.60.1.ebuild
new file mode 100644
index 000000000000..cd7f45cb1939
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.60.1.ebuild
@@ -0,0 +1,60 @@
+# 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.1 2013/06/13 13:14:53 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,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
+}