Version bump, remove qt-assistant dep (bug 441822, thanks Nikoli)

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

4 files changed, 96 insertions, 9 deletions

diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog
index 69a90030b260..510e8229f6f1 100644
--- a/dev-util/cppcheck/ChangeLog
+++ b/dev-util/cppcheck/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cppcheck
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.34 2012/11/03 17:32:27 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.35 2012/11/05 17:53:47 xmw Exp $
+
+*cppcheck-1.57 (05 Nov 2012)
+
+  05 Nov 2012; Michael Weber <xmw@gentoo.org> cppcheck-1.56.ebuild,
+  +cppcheck-1.57.ebuild:
+  Version bump, remove qt-assistant dep (bug 441822, thanks Nikoli)
 
   03 Nov 2012; Michael Weber <xmw@gentoo.org> -cppcheck-1.53.ebuild,
   -cppcheck-1.54.ebuild, -cppcheck-1.55.ebuild:
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 19660635e65d..787ec5bea227 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST cppcheck-1.56.tar.bz2 1131979 SHA256 0de45db8126a11f396130235a8b0c93ceff150a0afa675f5c7f5a07395c31df5 SHA512 f9dd83f38dc0255ecd122f7e7270e72ace5e9a4bbd14d94c9e47eff766c4eef3951f8b222a1c6e8b2613ba01d4e2140615f3309a0a60daacc399b3220038dec4 WHIRLPOOL b8ee263861048506e9da2e3b45dff2af69e3f2ddf47fef6e04f945b8576bad63c617b9eaf2daff994f0681958009fb1d60fdec8637355e668aedf11a4872fbdc
-EBUILD cppcheck-1.56.ebuild 1711 SHA256 522fb7841c0d6168af0c81c3f584c03c4f8ea49270382f235084cd8f6e9ddb05 SHA512 ebcb0e8a354d26a0258a4f9d2bd281e210ee889863f17fb7d39a93b09351f551572dc478da015b970da03e6bfd1c347fd0efb89224527d166058e8e9e29e79a2 WHIRLPOOL 66ad49d55d8d6905e8afd379fdad00207e57bcce87d28f56e4b7392ae1d0f5e866fe1f0eb0ff7ae2f763783fd413aa5cfd145066c5b20ffef5ac9e0806266262
-MISC ChangeLog 5474 SHA256 8423afb74ab9c01fe3f1fe4ed77ebc8a682bf403c51ff41ea891a118346e6953 SHA512 fd13e1563e2452a55ba99f9c23484f894def8e78a9615ec0fb09fb81dfbfecea6c5020da75f78c7252a89b61e2949ccc7a546e9a76f551d41db13d1f8a9ee607 WHIRLPOOL f32349a9a8a7f7a8b501f461c06262c8b36b0e996d3ff94fba602c9ef75c85423e7b38e5dcb7418c3ae846155344f2b3951e7ff258224039d9025b569379dd4e
+DIST cppcheck-1.57.tar.bz2 1180272 SHA256 8774a804e08465787e3ddc3af9faf496606c207aa65f750eefd2851a9ccdafd5 SHA512 14afca2fb2cac3965b189b1f110554d40c1db259b6f839407c3e2937d322ec9323e1f2fc1207bd1ba9c1e7af6f77fc5521a6201a7223d10be21fac6c625919df WHIRLPOOL 38e95045c66cd8df1f3e57925288b8ae6ac50c96fa7219f61361dd68b2f704079384480ef89b59f11e607dfebed74a49140cdaab073ff758299a3e71a65d5b5a
+EBUILD cppcheck-1.56.ebuild 1685 SHA256 efea3aceb29e91ccd246af2c640c899474ea1e8fd2bc0a2b65c7c97335356fae SHA512 40b5ac19c7ffb02744d36ec3687e924e80ac2c121a419125d4fcc595c6f2d83b1a0ae6b484913e74c23a9fdfd8eaee60521a591a8070e7225b99a64c1f00f8dd WHIRLPOOL 5471b7a2bd1a75464d45dc22329f2706024d14da700e1630228a2b619430ea169e124070a5adaa3312dbdb823a2fd90d57278819654086327d4a6a035736bdc7
+EBUILD cppcheck-1.57.ebuild 1685 SHA256 220867c0354568fe3647978a5911a78b7eb16ee70250c999286fc6e63bc895e7 SHA512 04f2871f2fe028cd7ddec36b4fcb4fe98e09065dc9e1f6545a02ef66fcfb765be5dcd8824e93d821144e6e1a81291c12a0f8071fb387a754a248753f1940b639 WHIRLPOOL 48f421bc48df536c93fe2ce77ed0abf2d0d4a92b7d0b0baa35c3a73a8eeca8ef59c8a768518f1781b2d28a46c477d4e73e0f77cd33e620bff8854fce03a2d6e9
+MISC ChangeLog 5666 SHA256 282e833c348289269d48e600024de2a106404ede55b88f3127a8a035106acbeb SHA512 6cf4983c42dab412efdee807e10c021d8cb0b1818b6b64558e2dd4b6ff487191e97bffc11c0d2226a84ef6460bb365dd3c49aa4e38b19a1f87fedb22b57efd05 WHIRLPOOL 6000691f900e32085a71a26963ad9e1fb09eb55bbd76e6b3e86fd63a2a24e3066da5007144f617414c7ad5d495ebd64d09b4085aca20d63fb43aa72910d7aaf5
 MISC metadata.xml 295 SHA256 4526a4860c02569699367a86914fabb0c0f4d7939ebbba1f728fc5bff7356583 SHA512 057b7f72a8bf12017d26717b3ac49883d21b5253a965722c9b23bb4dd9d23a6c64e070dad31a3e5d2abea4439592bd0144a5fdfb710ce843de2dd223369bd696 WHIRLPOOL b9f7e00e6b294237385d609666e3c7bdf0477809445e47e96e6efb911e451bc7281b1957bfffd8e8f35e8fd0a35789ccc7c3199eb6b2cd4070092cf41fd21cca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCVVTAACgkQknrdDGLu8JDNBQD9GQoPHgkbUm5raOLELJ+m1Di7
-4ZErb6v+9ZuHJn+/uosA/jEEk+X/haL9U4OmJ88uqwKVywhPrwvnEotkayiXDWvW
-=5Rw+
+iF4EAREIAAYFAlCX/S4ACgkQknrdDGLu8JAgWwD5AaMhxUBmqX38DlXUQn52mGoL
+gHz/4LqugAK0tGUZtuYA/RKMLRQLCiKoP7jlPFXIcEuZMbMdbx8yRuYCULFEs8eN
+=H9Tb
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cppcheck/cppcheck-1.56.ebuild b/dev-util/cppcheck/cppcheck-1.56.ebuild
index 704229a3a5ca..b2bb320c4a35 100644
--- a/dev-util/cppcheck/cppcheck-1.56.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.56.ebuild,v 1.1 2012/09/06 06:58:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.56.ebuild,v 1.2 2012/11/05 17:53:47 xmw Exp $
 
 EAPI="3"
 PYTHON_DEPEND="htmlreport? 2"
@@ -17,8 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="htmlreport qt4"
 
 DEPEND="htmlreport? ( dev-python/pygments )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-assistant:4 )"
+	qt4? ( x11-libs/qt-gui:4 )"
 RDEPEND="${DEPEND}"
 
 DISTUTILS_SETUP_FILES=("htmlreport|setup.py")
diff --git a/dev-util/cppcheck/cppcheck-1.57.ebuild b/dev-util/cppcheck/cppcheck-1.57.ebuild
new file mode 100644
index 000000000000..2cc2dfcd3324
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.57.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.57.ebuild,v 1.1 2012/11/05 17:53:47 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? ( x11-libs/qt-gui: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
+}