Version bump as requested by Christian Strahl (bug 473182)

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 73 insertions, 86 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/Manifest b/dev-util/cppcheck/Manifest
index 2ccf1381cf31..ba5b1a5766bb 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 DIST cppcheck-1.59.tar.bz2 1243616 SHA256 6be40d8422c545959d1cc44ce3f80be9f6d3d18f70d65b8d2e1b65284aa38f6e SHA512 c09f772a80e00c9a0a4ab09523e153dd21c205b6a91339886fbf36c2a27fc6c0a7c89d5721ed0e4c3f82df1b7e2d4b20949c78dcc167d2792d0d291d0c63b6e3 WHIRLPOOL ec9f6fcd079392bcc28a25700725b4bba87f10cc9eb1b7dceff7f268f4378731ae3cbc0f0156b486b1e3d6e9e8703890bc9c4a08ef96e205fc14a3209c3b6b1d
+DIST cppcheck-1.60.1.tar.bz2 1255595 SHA256 08c754744c1d53c2368692c133a69778f3bbfcce5c93a3f5b32575b9d7699449 SHA512 75e0ae2af2705670d2fb257447890f1214ceb341fde90b5380d5a47267bdf905ef5dd4d188e16e51662fa06f740c4b901b6c6376817070ebe69228654f4c9d2b WHIRLPOOL e79d0ec5b666fc4a09b8a84e14214dcd57f7a94b5a14ae8644f1145b69120321b890edb2a83627f5075a638d2c767ada51fbbe7ad7e345d80b33034620aa63e6
 EBUILD cppcheck-1.59-r1.ebuild 1207 SHA256 36c20a095c1a7af6d9cb98f1d83c8cb16c7a82a1b54920818b1682ec85f1a928 SHA512 b832f37fed5a2c2638319a138f1ff1ee1793ef2e1f36cf7d302c580fe501f1ef3f58743d9936387ee14d13280b8274a25ed895baa65a1653d812156b9a94bbdf WHIRLPOOL 68bcee2106776d5faf3858c6bddb640c034d79ab9797c20ad862ae04350a4661cc0562cd001ebcf07eb3ff2d61fb904460247fed6425ecf731eb7f6135751b76
-EBUILD cppcheck-1.59.ebuild 1682 SHA256 418410cb03a923f262a886c617bc6556921eca38aba9f1f894fe7765d6ea96ca SHA512 4a38f534583df4357f58f8ff88a6e87db71b7f717345072c3c3133492f674bde451d11402f891a36015244b648aacd6d9e5ad54fe268e0ddb54fe6fddce4a949 WHIRLPOOL 0b955b5896bf91001960baed8b8112325dce0a9da40d7234775a725ddcfe159efc4ff853a105cabd5af1f455604ed7aeaa5282c38ff8dd16e6d4dbf9e0ba3006
-MISC ChangeLog 6423 SHA256 23d965fc466dcc5f0d4fe10d25b50108f0c4685b128a86a5aaa92f3c55e26ffb SHA512 a084db94b988cb01b62d9a18fc1acc5faf19a374ef343e94fa2579ce02f263ad871bed5778daa361cd640ead8ba59748a8a0b95569c1c4681479d694fd0b9ad5 WHIRLPOOL b3fd119d1224f39faeb35e9d932ffd9c741cbb70da43059f86d0710d64f23a668ce9545c8997e69a2f8ceb1bef6722e7697e825e0794ae412b07f9785bdc9222
+EBUILD cppcheck-1.60.1.ebuild 1206 SHA256 a17c6fab37720d6283af6abfa108a28e39059a71db20c8161caadf1fc8a2b7f6 SHA512 b36265b8e3baed04f854251f52e8acb738aa748be0700bd0f438aa00e7c65dfedaad7ea4cc03f32731603c2e2c7bd58ff0c3ce0bad688d4ecb0d3d61004f4743 WHIRLPOOL 4165b750f0003f691fffcd65574c762f92782a7c74b668bd9045521fd3e236f18b66f9c37e7104b758370e54049bcf7b17949979ae99d7dec0bae831d1c75ce8
+MISC ChangeLog 6613 SHA256 2b0ff7486684ccbc07b07cdc87bbc39d9e68b8f3ec088b3388f2c24efed50ac3 SHA512 7b0959b101ad7e3d1d4ae06a2e213aa311921f9898a0cbeb0e007e703bf77f8fd8f0aca086c239f019804637d5fd2d310a5fd85c9c2497d1f56c756c8fe6508d WHIRLPOOL 5d433a7ef432ce1cfe5e4a786262a6667ddf5c293f0236b9904ee0c29a485d4b553b4425af5a11d709b0c75b35d31322a4e08614da59f9f2e54978bd024a6d1d
 MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGlJpAACgkQknrdDGLu8JA8fwEAkNo7z8JKqrsT+Ung6ZRIH//u
-3sQ8o7t5eShdjy904m8A/iRH9GVCeu9Lkj/jxTNkOHsfsGfbgqGlAZ0hS32jgW/0
-=N3WI
+iF4EAREIAAYFAlG5xdIACgkQknrdDGLu8JAcOgEAh2eWgEDhQilJydhyUI5e/s0m
+otq6R14jTA24vuCPN24A/0p7emEkvUTHv9k7gG7Br3nzFrC32EhB8teNqbClTKAa
+=gJhQ
 -----END PGP SIGNATURE-----
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
+}