xmw 14/10/10 13:23:54 Modified: cppcheck-1.65-r1.ebuild ChangeLog Log: Backport ebuild improvements (test, bug 511438), manpage. (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.3 dev-util/cppcheck/cppcheck-1.65-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild?r1=1.2&r2=1.3 Index: cppcheck-1.65-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cppcheck-1.65-r1.ebuild 10 Oct 2014 06:31:14 -0000 1.2 +++ cppcheck-1.65-r1.ebuild 10 Oct 2014 13:23:54 -0000 1.3 @@ -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.65-r1.ebuild,v 1.2 2014/10/10 06:31:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild,v 1.3 2014/10/10 13:23:54 xmw Exp $ EAPI=5 @@ -10,35 +10,38 @@ DESCRIPTION="static analyzer of C/C++ code" HOMEPAGE="http://cppcheck.sourceforge.net"; -SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="htmlreport qt4" +IUSE="htmlreport pcre qt4" RDEPEND="htmlreport? ( ${PYTHON_DEPS} ) >=dev-libs/tinyxml2-2 - qt4? ( dev-qt/qtgui:4 )" + qt4? ( dev-qt/qtgui:4 ) + pcre? ( dev-libs/libpcre )" DEPEND="${RDEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt virtual/pkgconfig" src_prepare() { # Drop bundled libs, patch Makefile generator and re-run it rm -r externals || die epatch "${FILESDIR}"/${P}-tinyxml2.patch - emake dmake \ - CPPFLAGS="${CPPFLAGS}" \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ + tc-export CXX + emake dmake ./dmake || die epatch "${FILESDIR}"/${P}-c++0x.patch } src_configure() { - tc-export CXX + if use pcre ; then + sed -e '/HAVE_RULES=/s:=no:=yes:' \ + -i Makefile + fi if use qt4 ; then pushd gui qt4-r2_src_configure @@ -47,16 +50,10 @@ } src_compile() { - local my_inc=$(pkg-config --cflags-only-I tinyxml2) - emake CFGDIR="/usr/share/${PN}/cfg" \ - CPPFLAGS="${CPPFLAGS}" \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - INCLUDE_FOR_LIB="-Ilib ${my_inc}" \ - INCLUDE_FOR_CLI="-Ilib ${my_inc}" \ - INCLUDE_FOR_TEST="-Ilib -Icli ${my_inc}" \ - LIBS="$(pkg-config --libs tinyxml2)" + export LIBS="$(pkg-config --libs tinyxml2)" + emake ${PN} man \ + CFGDIR="${EROOT}usr/share/${PN}/cfg" \ + DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl" if use qt4 ; then pushd gui @@ -71,18 +68,25 @@ } src_test() { - emake check \ - LIBS="$(pkg-config --libs tinyxml2)" + # safe final version + mv -v ${PN}{,.final} + mv -v lib/library.o{,.final} + mv -v cli/cppcheckexecutor.o{,.final} + #trigger recompile with CFGDIR inside ${S} + emake check CFGDIR="${S}/cfg" + # restore + mv -v ${PN}{.final,} + mv -v lib/library.o{.final,} + mv -v cli/cppcheckexecutor.o{.final,} } src_install() { emake install DESTDIR="${D}" - 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} + dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}} fi if use htmlreport ; then pushd htmlreport @@ -90,4 +94,6 @@ popd find "${D}" -name "*.egg-info" -delete fi + doman ${PN}.1 + dodoc readme.txt } 1.57 dev-util/cppcheck/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?rev=1.57&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?rev=1.57&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?r1=1.56&r2=1.57 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ChangeLog 10 Oct 2014 13:04:51 -0000 1.56 +++ ChangeLog 10 Oct 2014 13:23:54 -0000 1.57 @@ -1,6 +1,9 @@ # 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.56 2014/10/10 13:04:51 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.57 2014/10/10 13:23:54 xmw Exp $ + + 10 Oct 2014; Michael Weber <x...@gentoo.org> cppcheck-1.65-r1.ebuild: + Backport ebuild improvements (test, bug 511438), manpage. *cppcheck-1.66 (10 Oct 2014)
