gentoo resync : 26.11.2017

3 files changed, 136 insertions, 26 deletions

diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 4facbf87dfa6..28396a469b41 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,11 +1,11 @@
-AUX cppcheck-1.75-tinyxml2.patch 2294 SHA256 309309d7af8046e7841c0de02404f804aa09015dfcc6e58c9e8edd48f3fdcf74 SHA512 5eebe4e85649a5e9e0fd312dbaf4284a68327125322f1c6b905ec93b1d445978dd532c4c8c18ad0478f29a50c77761fed1d0ecb2dca3148c0c7c747d391e7f07 WHIRLPOOL 53b8d1b13861f16ab0bc7aa50591a12e8882f190e7917e15931cd88375540cd868b5aec7b79eebbdc1f5f25e187f6bb808e458b019014e8c6edc50ad58864388
+AUX cppcheck-1.75-tinyxml2.patch 2294 BLAKE2B 78763d10fdddb3d7f0cdaca9271007e97cd981ce1a5a39a91c928def6611cc379b411f9f8380d8f3b4b23554277cfc5a9c6e0797a80378d6e956ee2668dcbc5a SHA512 5eebe4e85649a5e9e0fd312dbaf4284a68327125322f1c6b905ec93b1d445978dd532c4c8c18ad0478f29a50c77761fed1d0ecb2dca3148c0c7c747d391e7f07
 DIST cppcheck-1.77.tar.bz2 1188453 SHA256 1980ffe5c9c24bb6dea24514d42be3aa49d6ba7cc26c448b3543611fe8ba2619 SHA512 df8dddf7758c342d45b3393246e07eaa11a53dca19e8a0d09de04f12ea6232538941328d9ca9ac52eb425871fd1c49d55c77e6e38b40772b6f856fd1e9e99779 WHIRLPOOL 9f7842eba0f53a999993dbd23d09c10e5bd3dcca5ecbb0689e4ded8c7529d84fd939a57ce9cd267cdd21b2d79aeb6c07d672983ccb52be0fcc0b28ca80a31b59
 DIST cppcheck-1.78.tar.bz2 1201959 SHA256 e42696f7d6321b98cb479ad9728d051effe543b26aca8102428f60b9850786b1 SHA512 598556e9d657a3a77ff889cb6647291160017f7f9322326771416ff59d44126ce47c39767657b863cdb8a1b46d7c83bb337ec2fe0574500b37e99c33377b5dd8 WHIRLPOOL 2087ad837353d01bca828af940c427909a3e556e97e46d1822e0f2f527619c87b15d1a7f647992dd46eb3a2ef1eb4fb86344db31d7a01fb6f8a9070dfeecef96
 DIST cppcheck-1.79.tar.bz2 1206623 SHA256 2b85b693de54f15048f1841e7aef74574f99da6270d2182baba78514fa27f06d SHA512 766649b685d60b057752a49eda46f5bb42681c01c32169e83f85ea6f5d3302b572a2d484c1cee1380fd304489d5a32f83eb59a72ceefb1b787031e84bf3a2676 WHIRLPOOL dee33b68c8b924a68b90cbabcd9da6489003fb9f4fc0e2f5d411c82404c666b0c034ca33cc8e4043e4b1d18622158d1dd3de3b8ebd83d52ee01cd3513a39ad26
-EBUILD cppcheck-1.77.ebuild 2205 SHA256 b2834f429f6d45a05e8c6bc3481fa732a37365e9ce0619ecbbd83e83e7d09f3c SHA512 4bb41789b127b96ccf383a9da90417b885bc8f5329d7093859dc8d036229a5d63a0a711b9a873e12a884db1ec8ac094939efe9a067f87069050ceb7e0a5dff9d WHIRLPOOL e21778a8fcd194c72a41966f822972aef1f929961be2d4d1a7b49ef6ad3c005b536b244e3ae6e2f4957b6cf9f95dfddd677a02f330a477c0dfa939e04a375985
-EBUILD cppcheck-1.78.ebuild 2209 SHA256 8274e4e120b62fd6de8eb9ea0374fc2157de8d12987613215fd9f5caea6a222a SHA512 b5716c018561011fe21cdfc2c1b16b08388d160ef6c588995fd69170db8fe2e9db60e6df8ad3fc964e762b256242eaaca5b6d57291e1eb7a651c79b5ca9aa3a8 WHIRLPOOL 0068e1dbcf7d43af42579f3a6e8f88d89780425d4afc7f89433775dfcc11beccac18f41b19a4a614722bfa83e63cd5f647929ea4bb6d0614b112966d458c611c
-EBUILD cppcheck-1.79.ebuild 2216 SHA256 605169bdcd9d9c4a8d1b3a9dc1fb667dfaafb8c1dd94ff76f8eb3e1e004c3764 SHA512 06533cff4fd86c056b44ef891e5cb0be02f928e4f65b14c37328fae026150a4396b3cb9c99f6af63f1375cb261129bfc63afb4eb6d787885021a43916bd7f877 WHIRLPOOL 0b19afe39c24fead78eb97829ca99f96c2bbd5ad115a981220cdc7d0460305550402f4abbb196cc3dc662b49789fc9c5a1c5264db71334585d476d4196234d5e
-EBUILD cppcheck-9999.ebuild 2196 SHA256 b5b9ab11751b82408531d1391190be14ceec633cdbf3a8c4c942965f9daead38 SHA512 5dacbd45a70f2190492a0d3adb92753ac768579ffa2ca9fea5dac74bcde3e3c889465deb3f46248b7a870fdc9dc5853ee721975e2b5f1a4c136564a5d450b9ac WHIRLPOOL c94929ed0c9e18b8e6aca4c8f15e9c28b03aa4ef483a313076d11f58b0dcc0d3e2053fbaa15a8ce1c5d720812708eef9a43e64e7cd59d95334ca8dfc75851cf1
-MISC ChangeLog 5582 SHA256 507ae46ed2c6e07dcd0fead0ffd82651a50b36f2cf2296e5c978178f5696964c SHA512 d16a214991a86f76f11edeed8378c0208c0117cb20a62ce351a63b64ebee778c41f81be7fb021c7c557c197c93f16e727801af05322f0177ce554d1225a1fc13 WHIRLPOOL 24efef1ac7031d3782ab487fa8853463b96112cec85577723edd534aeeec9f77f61c139b184b6e9c81b96212c4f9b4d11b08dc1cc64dfd574a337999bbaf7ad3
-MISC ChangeLog-2015 10993 SHA256 012074ab8ab80f8cce91ceb12de1dcaabf7edc2cd76e3a8ee612c74c7a2f1f05 SHA512 72ce4bdd77ffe3a9bdaf89dbbef5d763fbf43d3ec694bfe8758a5cbfe2bcef11256b8975aa60631145993d032e572135bbe9595d15682329ca222a45412e01c8 WHIRLPOOL ea46d1646fa95ac52158453e7798d9c61dd3c9cdc92a791611a0636b8ced3cf57ed58959e0fe50f40bf064694299045449796b7bf114e807c68a7bddca363c2c
-MISC metadata.xml 397 SHA256 3f1be41c16f6248d0484bb9322303a683ed6fec8e6472bb133353f4cb14d41db SHA512 63aebce854e81f3fb0584e47f75b416f33a6ff8cae55652d952c89b546ef28312ad44ab01113e9bedaf1b1181137930d066344c11773bb263baff7f27b7a313e WHIRLPOOL c5e8fd8dba7da098ebb271a41fdf9ff42840e5868479d8cf49ce5e3ea3c1adf6ff5491594ddc4d21e97afcebe6fd441a08f31ee926f2c75f6b7f36b7fe267a57
+DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B 2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f SHA512 22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
+EBUILD cppcheck-1.77.ebuild 2205 BLAKE2B 0bb1574cf65b4232f9b68721a4f0bbe91320628c6dcceb29c131bf0c6598bd9f6d5ec8010d1d2a8aecb770f7eca629ff8a683e154a4dc6045fdc14816b066a8a SHA512 4bb41789b127b96ccf383a9da90417b885bc8f5329d7093859dc8d036229a5d63a0a711b9a873e12a884db1ec8ac094939efe9a067f87069050ceb7e0a5dff9d
+EBUILD cppcheck-1.78.ebuild 2209 BLAKE2B 0e524f475b615ccd650e32129e76a0acd53490bdee9d3dd9c4dd44885a9d3a62023ce721b14a66f92abe9f6eb941ee0fa7898ce07e5a614da4b02c526c24bb6a SHA512 b5716c018561011fe21cdfc2c1b16b08388d160ef6c588995fd69170db8fe2e9db60e6df8ad3fc964e762b256242eaaca5b6d57291e1eb7a651c79b5ca9aa3a8
+EBUILD cppcheck-1.79.ebuild 2216 BLAKE2B 2a5327192135b81729f380ee819cc8c8a97506cc3d4a46e8424a2735e857dfa37a64938a7515d471e099309742ad76954729ad162f1cc9793f2cd843147d8dde SHA512 06533cff4fd86c056b44ef891e5cb0be02f928e4f65b14c37328fae026150a4396b3cb9c99f6af63f1375cb261129bfc63afb4eb6d787885021a43916bd7f877
+EBUILD cppcheck-1.81.ebuild 2194 BLAKE2B 2ddcf88477d81df17b8211461c30acd108be30e63b5e6e3bca647508dd1cb390a677dab22327e7897ed0e0656b22e5aaa6914610d541326e9ffec37c953d72ff SHA512 bc6cc0f2202ded2f7b0dbeed8718aa39ae6446b395fdf5e947f36c4e80f58c8107381bf9404a8b8cc4c6eb755c49b808e030a11a4780f1fab5a56975af18b600
+EBUILD cppcheck-9999.ebuild 2177 BLAKE2B cf8b92882feb4ffc711994e8911322e0866df6622933096f27daeb6a59d608f3408922e6c7428d2a9606900b5d5e24f73b8f104f7dd61ab6420bffe163b86aba SHA512 035b46dcbb6ed598769849250e911957bf2575a209effeb099124a4930715b72cc0a3e8f8e4212626446bff29bdb9852c5bc2c1a0542b50c4d9266b6daf5c7e0
+MISC metadata.xml 397 BLAKE2B 4ed8f4270fb9d5cccf84c6eaa6feed2ea1bd662f50b85bd39afa0c715e535be35dd67efa462477d43e5b2c118838b11b9b613638d330be7999d4dc3d59193c42 SHA512 63aebce854e81f3fb0584e47f75b416f33a6ff8cae55652d952c89b546ef28312ad44ab01113e9bedaf1b1181137930d066344c11773bb263baff7f27b7a313e
diff --git a/dev-util/cppcheck/cppcheck-1.81.ebuild b/dev-util/cppcheck/cppcheck-1.81.ebuild
new file mode 100644
index 000000000000..4bdd238b7e07
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.81.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 flag-o-matic qmake-utils 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 ~arm64 ~hppa ~x86"
+IUSE="htmlreport pcre qt5"
+
+RDEPEND="
+	>=dev-libs/tinyxml2-2
+	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
+
+src_prepare() {
+	default
+	append-cxxflags -std=c++0x
+
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals/tinyxml || die
+	tc-export CXX
+	emake dmake
+	./dmake || die
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile
+	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 qt5 ; then
+		pushd gui
+		eqmake5
+		emake
+		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 qt5 ; then
+		dobin gui/${PN}-gui
+		dodoc 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 -r triage
+}
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 529f5e6fadc3..4ed390f176fb 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic git-r3
+inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs git-r3
 
 DESCRIPTION="static analyzer of C/C++ code"
 HOMEPAGE="http://cppcheck.sourceforge.net"
@@ -14,28 +14,35 @@ EGIT_REPO_URI="https://github.com/danmar/cppcheck.git"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="htmlreport pcre qt4"
+IUSE="htmlreport pcre qt5"
 
-RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+RDEPEND="
 	>=dev-libs/tinyxml2-2
-	qt4? ( dev-qt/qtgui:4 )
-	pcre? ( dev-libs/libpcre )"
+	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+	)
+"
 DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
 
 src_prepare() {
+	default
 	append-cxxflags -std=c++0x
 
 	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
 	tc-export CXX
 	emake dmake
 	./dmake || die
-
-	epatch_user
 }
 
 src_configure() {
@@ -43,11 +50,6 @@ src_configure() {
 		sed -e '/HAVE_RULES=/s:=no:=yes:' \
 			-i Makefile
 	fi
-	if use qt4 ; then
-		pushd gui
-		qt4-r2_src_configure
-		popd
-	fi
 }
 
 src_compile() {
@@ -56,9 +58,10 @@ src_compile() {
 		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
 		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
 
-	if use qt4 ; then
+	if use qt5 ; then
 		pushd gui
-		qt4-r2_src_compile
+		eqmake5
+		emake
 		popd
 	fi
 	if use htmlreport ; then
@@ -87,7 +90,7 @@ src_install() {
 
 	insinto "/usr/share/${PN}/cfg"
 	doins cfg/*.cfg
-	if use qt4 ; then
+	if use qt5 ; then
 		dobin gui/${PN}-gui
 		dodoc gui/{projectfile.txt,gui.${PN}}
 	fi