From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1041406-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C5009138334
for <garchives@archives.gentoo.org>; Sat, 11 Aug 2018 09:07:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7F45DE083E;
Sat, 11 Aug 2018 09:07:00 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4F268E083E
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Aug 2018 09:07:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D0F89335CB7
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Aug 2018 09:06:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B7A0E3AD
for <gentoo-commits@lists.gentoo.org>; Sat, 11 Aug 2018 09:06:54 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1533977393.c78dddfa009b97b1d089fe743d43fb90d95f1deb.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/cppcheck/cppcheck-9999.ebuild
X-VCS-Directories: dev-util/cppcheck/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: c78dddfa009b97b1d089fe743d43fb90d95f1deb
X-VCS-Branch: master
Date: Sat, 11 Aug 2018 09:06:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a285846c-15a2-4358-a43c-eaf8f5c4a888
X-Archives-Hash: c8ea7f7d28932d83542bb993dcaaae6d
commit: c78dddfa009b97b1d089fe743d43fb90d95f1deb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 08:49:53 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 08:49:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78dddfa
dev-util/cppcheck: Sync live with 1.84 changes
Package-Manager: Portage-2.3.45, Repoman-2.3.10
dev-util/cppcheck/cppcheck-9999.ebuild | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 2ef2f6f37ca..dcbdddafe55 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -11,13 +11,13 @@ DESCRIPTION="static analyzer of C/C++ code"
HOMEPAGE="http://cppcheck.sourceforge.net"
EGIT_REPO_URI="https://github.com/danmar/cppcheck.git"
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS=""
IUSE="htmlreport pcre qt5"
RDEPEND="
- >=dev-libs/tinyxml2-2
+ dev-libs/tinyxml2:=
htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
pcre? ( dev-libs/libpcre )
qt5? (
@@ -48,7 +48,7 @@ src_prepare() {
src_configure() {
if use pcre ; then
sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
+ -i Makefile || die
fi
}
@@ -59,29 +59,29 @@ src_compile() {
DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
if use qt5 ; then
- pushd gui
+ pushd gui || die
eqmake5
emake
- popd
+ popd || die
fi
if use htmlreport ; then
- pushd htmlreport
+ pushd htmlreport || die
distutils-r1_src_compile
- popd
+ popd || die
fi
}
src_test() {
# safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
+ mv -v ${PN}{,.final} || die
+ mv -v lib/library.o{,.final} || die
+ mv -v cli/cppcheckexecutor.o{,.final} || die
#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,}
+ mv -v ${PN}{.final,} || die
+ mv -v lib/library.o{.final,} || die
+ mv -v cli/cppcheckexecutor.o{.final,} || die
}
src_install() {
@@ -95,9 +95,9 @@ src_install() {
dodoc gui/{projectfile.txt,gui.${PN}}
fi
if use htmlreport ; then
- pushd htmlreport
+ pushd htmlreport || die
distutils-r1_src_install
- popd
+ popd || die
find "${D}" -name "*.egg-info" -delete
else
rm "${ED}/usr/bin/cppcheck-htmlreport" || die