From 0bd601ddab54aad0105ddfab2612d9a48b4ac38e Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Thu, 11 Nov 2010 12:07:38 +0000 Subject: Taking maintainership. Fix bug #320369 and bug #343997 (Portage version: 2.1.8.3/cvs/Linux x86_64) --- dev-util/cppcheck/ChangeLog | 11 ++++- dev-util/cppcheck/cppcheck-1.45-r1.ebuild | 75 +++++++++++++++++++++++++++++++ dev-util/cppcheck/cppcheck-1.45.ebuild | 53 ---------------------- dev-util/cppcheck/metadata.xml | 11 +++-- 4 files changed, 92 insertions(+), 58 deletions(-) create mode 100644 dev-util/cppcheck/cppcheck-1.45-r1.ebuild delete mode 100644 dev-util/cppcheck/cppcheck-1.45.ebuild (limited to 'dev-util/cppcheck') diff --git a/dev-util/cppcheck/ChangeLog b/dev-util/cppcheck/ChangeLog index e544076d36e0..eb92af62e233 100644 --- a/dev-util/cppcheck/ChangeLog +++ b/dev-util/cppcheck/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-util/cppcheck # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.18 2010/11/03 12:17:00 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.19 2010/11/11 12:07:38 xmw Exp $ + +*cppcheck-1.45-r1 (11 Nov 2010) + + 11 Nov 2010; Michael Weber -cppcheck-1.45.ebuild, + +cppcheck-1.45-r1.ebuild, metadata.xml: + Taking maintainership. Added python/distutils eclasses and IUSE htmlreport + to support cppcheck-htmlreport (thanks to David Hallas on + bug #320369). Fixed cppcheck-gui installation (thanks to John Keeping + on bug #343997). 03 Nov 2010; Patrick Lauer cppcheck-1.45.ebuild: Adding missing qt-assistant dep, #343959 diff --git a/dev-util/cppcheck/cppcheck-1.45-r1.ebuild b/dev-util/cppcheck/cppcheck-1.45-r1.ebuild new file mode 100644 index 000000000000..0fd30f8980a2 --- /dev/null +++ b/dev-util/cppcheck/cppcheck-1.45-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.45-r1.ebuild,v 1.1 2010/11/11 12:07:38 xmw Exp $ + +EAPI=2 + +PYTHON_DEPEND="htmlreport? 2" + +inherit distutils eutils python toolchain-funcs qt4-r2 + +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 + x11-libs/qt-assistant:4 )" + +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 + if use htmlreport ; then + pushd htmlreport + distutils_src_compile + popd + fi +} + +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 + if use htmlreport ; then + pushd htmlreport + distutils_src_install + popd + fi +} diff --git a/dev-util/cppcheck/cppcheck-1.45.ebuild b/dev-util/cppcheck/cppcheck-1.45.ebuild deleted file mode 100644 index 31f6b063adc8..000000000000 --- a/dev-util/cppcheck/cppcheck-1.45.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.45.ebuild,v 1.2 2010/11/03 12:17:00 patrick Exp $ - -EAPI=2 -inherit eutils toolchain-funcs qt4-r2 - -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="qt4" - -DEPEND="qt4? ( x11-libs/qt-gui:4 - x11-libs/qt-assistant:4 )" - -src_prepare() { - sed -i \ - -e '/^CXXFLAGS/d' \ - -e '/^CXX=/d' \ - Makefile \ - || die - tc-export CXX -} - -src_configure() { - if use qt4; then - pushd gui - eqmake4 gui.pro - popd - fi -} - -src_compile() { - emake || die "make failed" - if use qt4; then - pushd gui - emake || die "make gui failed" - popd - fi -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc readme.txt - if use qt4; then - newbin gui/gui cppcheck-gui - dodoc readme_gui.txt gui/projectfile.txt gui/gui.cppcheck - fi -} diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml index d15f5b06cdc9..f55a2eb377bc 100644 --- a/dev-util/cppcheck/metadata.xml +++ b/dev-util/cppcheck/metadata.xml @@ -2,8 +2,11 @@ no-herd - - patrick@gentoo.org - Patrick Lauer (until someone else wants to handle it) - + +xmw@gentoo.org +Michael Weber + + +install cppcheck-htmlreport + -- cgit v1.2.3-65-gdbad