| 1 |
commit: 4d38a0a581dfe9e5b862035ff263b0d7f8e98230 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 22 21:56:50 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 22 22:00:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d38a0a5 |
| 7 |
|
| 8 |
dev-util/cppcheck: Sync live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-util/cppcheck/cppcheck-9999.ebuild | 35 +++++++++++++++++----------------- |
| 13 |
1 file changed, 17 insertions(+), 18 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild |
| 16 |
index 529f5e6fadc..9d1b60c1c4b 100644 |
| 17 |
--- a/dev-util/cppcheck/cppcheck-9999.ebuild |
| 18 |
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild |
| 19 |
@@ -1,11 +1,11 @@ |
| 20 |
# Copyright 1999-2017 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI=5 |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 27 |
|
| 28 |
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic git-r3 |
| 29 |
+inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs git-r3 |
| 30 |
|
| 31 |
DESCRIPTION="static analyzer of C/C++ code" |
| 32 |
HOMEPAGE="http://cppcheck.sourceforge.net" |
| 33 |
@@ -14,28 +14,31 @@ EGIT_REPO_URI="https://github.com/danmar/cppcheck.git" |
| 34 |
LICENSE="GPL-3" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="" |
| 37 |
-IUSE="htmlreport pcre qt4" |
| 38 |
+IUSE="htmlreport pcre qt5" |
| 39 |
|
| 40 |
-RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] ) |
| 41 |
+RDEPEND=" |
| 42 |
>=dev-libs/tinyxml2-2 |
| 43 |
- qt4? ( dev-qt/qtgui:4 ) |
| 44 |
- pcre? ( dev-libs/libpcre )" |
| 45 |
+ htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] ) |
| 46 |
+ pcre? ( dev-libs/libpcre ) |
| 47 |
+ qt5? ( dev-qt/qtgui:5 ) |
| 48 |
+" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
app-text/docbook-xsl-stylesheets |
| 51 |
dev-libs/libxslt |
| 52 |
- virtual/pkgconfig" |
| 53 |
+ virtual/pkgconfig |
| 54 |
+" |
| 55 |
+ |
| 56 |
+PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch ) |
| 57 |
|
| 58 |
src_prepare() { |
| 59 |
+ default |
| 60 |
append-cxxflags -std=c++0x |
| 61 |
|
| 62 |
# Drop bundled libs, patch Makefile generator and re-run it |
| 63 |
rm -r externals/tinyxml || die |
| 64 |
- epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch |
| 65 |
tc-export CXX |
| 66 |
emake dmake |
| 67 |
./dmake || die |
| 68 |
- |
| 69 |
- epatch_user |
| 70 |
} |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
@@ -43,11 +46,6 @@ src_configure() { |
| 74 |
sed -e '/HAVE_RULES=/s:=no:=yes:' \ |
| 75 |
-i Makefile |
| 76 |
fi |
| 77 |
- if use qt4 ; then |
| 78 |
- pushd gui |
| 79 |
- qt4-r2_src_configure |
| 80 |
- popd |
| 81 |
- fi |
| 82 |
} |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
@@ -56,9 +54,10 @@ src_compile() { |
| 86 |
CFGDIR="${EROOT}usr/share/${PN}/cfg" \ |
| 87 |
DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl" |
| 88 |
|
| 89 |
- if use qt4 ; then |
| 90 |
+ if use qt5 ; then |
| 91 |
pushd gui |
| 92 |
- qt4-r2_src_compile |
| 93 |
+ eqmake5 |
| 94 |
+ emake |
| 95 |
popd |
| 96 |
fi |
| 97 |
if use htmlreport ; then |
| 98 |
@@ -87,7 +86,7 @@ src_install() { |
| 99 |
|
| 100 |
insinto "/usr/share/${PN}/cfg" |
| 101 |
doins cfg/*.cfg |
| 102 |
- if use qt4 ; then |
| 103 |
+ if use qt5 ; then |
| 104 |
dobin gui/${PN}-gui |
| 105 |
dodoc gui/{projectfile.txt,gui.${PN}} |
| 106 |
fi |
Archives