pinkbyte    15/08/04 16:57:58

  Modified:             ChangeLog
  Added:                cppcheck-1.69-r1.ebuild
  Log:
  Revision bump: add support for user patches, do not install htmlreport if 
USE='-htmlreport', correct Python dependencies
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0x60C0742D1F357D42)

Revision  Changes    Path
1.67                 dev-util/cppcheck/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?rev=1.67&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?rev=1.67&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?r1=1.66&r2=1.67

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog   23 May 2015 01:37:38 -0000      1.66
+++ ChangeLog   4 Aug 2015 16:57:58 -0000       1.67
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cppcheck
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.66 
2015/05/23 01:37:38 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.67 
2015/08/04 16:57:58 pinkbyte Exp $
+
+*cppcheck-1.69-r1 (04 Aug 2015)
+
+  04 Aug 2015; Sergey Popov <[email protected]> +cppcheck-1.69-r1.ebuild:
+  Revision bump: add support for user patches, do not install htmlreport if
+  USE='-htmlreport', correct Python dependencies
 
   23 May 2015; Michael Weber <[email protected]> cppcheck-1.69.ebuild:
   Switch back to 1.68 ebuild style.



1.1                  dev-util/cppcheck/cppcheck-1.69-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/cppcheck-1.69-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/cppcheck-1.69-r1.ebuild?rev=1.1&content-type=text/plain

Index: cppcheck-1.69-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.69-r1.ebuild,v 
1.1 2015/08/04 16:57:58 pinkbyte Exp $

EAPI=5

PYTHON_COMPAT=( python{2_7,3_3,3_4} )

inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs

DESCRIPTION="static analyzer of C/C++ code"
HOMEPAGE="http://cppcheck.sourceforge.net";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="htmlreport pcre qt4"

RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
        >=dev-libs/tinyxml2-2
        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}"/${PN}-1.69-tinyxml2.patch
        tc-export CXX
        emake dmake
        ./dmake || die

        epatch "${FILESDIR}"/${PN}-1.69-c++0x.patch

        epatch_user
}

src_configure() {
        if use pcre ; then
                sed -e '/HAVE_RULES=/s:=no:=yes:' \
                        -i Makefile
        fi
        if use qt4 ; then
                pushd gui
                qt4-r2_src_configure
                popd
        fi
}

src_compile() {
        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
                qt4-r2_src_compile
                popd
        fi
        if use htmlreport ; then
                pushd htmlreport
                distutils-r1_src_compile
                popd
        fi
}

src_test() {
        # 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() {
        # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
        emake install DESTDIR="${ED}"

        insinto "/usr/share/${PN}/cfg"
        doins cfg/*.cfg
        if use qt4 ; then
                dobin gui/${PN}-gui
                dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
        fi
        if use htmlreport ; then
                pushd htmlreport
                distutils-r1_src_install
                popd
                find "${D}" -name "*.egg-info" -delete
        else
                rm "${ED}/usr/bin/cppcheck-htmlreport" || die
        fi
        doman ${PN}.1
        dodoc readme.txt
        dodoc -r triage
}




Reply via email to