xmw 14/10/09 23:16:33 Modified: ChangeLog Added: cppcheck-1.65-r1.ebuild Log: Remove bundled tinyxml2 by adjusting Makefile generator (bug 522368). (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.53 dev-util/cppcheck/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?rev=1.53&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?rev=1.53&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/ChangeLog?r1=1.52&r2=1.53 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- ChangeLog 19 May 2014 15:50:29 -0000 1.52 +++ ChangeLog 9 Oct 2014 23:16:33 -0000 1.53 @@ -1,6 +1,12 @@ # 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.52 2014/05/19 15:50:29 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/ChangeLog,v 1.53 2014/10/09 23:16:33 xmw Exp $ + +*cppcheck-1.65-r1 (09 Oct 2014) + + 09 Oct 2014; Michael Weber <[email protected]> +cppcheck-1.65-r1.ebuild, + +files/cppcheck-1.65-r1-tinyxml2.patch: + Remove bundled tinyxml2 by adjusting Makefile generator (bug 522368). *cppcheck-1.65 (19 May 2014) 1.1 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.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cppcheck/cppcheck-1.65-r1.ebuild?rev=1.1&content-type=text/plain Index: cppcheck-1.65-r1.ebuild =================================================================== # 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.1 2014/10/09 23:16:33 xmw Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) 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/cppcheck/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="htmlreport qt4" RDEPEND="htmlreport? ( ${PYTHON_DEPS} ) >=dev-libs/tinyxml2-2 qt4? ( dev-qt/qtgui:4 )" DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { # Drop bundled libs, patch Makefile generator and re-run it rm -r externals || die epatch "${FILESDIR}"/${PF}-tinyxml2.patch emake dmake \ CPPFLAGS="${CPPFLAGS}" \ CXX="$(tc-getCXX)" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" \ ./dmake || die epatch "${FILESDIR}"/${P}-c++0x.patch } src_configure() { tc-export CXX if use qt4 ; then pushd gui qt4-r2_src_configure popd fi } 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)" 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() { emake check \ LIBS="$(pkg-config --libs tinyxml2)" } 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} fi if use htmlreport ; then pushd htmlreport distutils-r1_src_install popd find "${D}" -name "*.egg-info" -delete fi }
