gentoo resync : 17.05.2018

5 files changed, 63 insertions, 11 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 8f4d95542ba6..1e2c7de4a04a 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,5 +1,6 @@
 AUX kicad-4.0.4-boost-context.patch 3859 BLAKE2B 9a96afb2bcde041d26af382827a95bead2b8da6e7202c74cdbe5f879d27dc37b4868c5158f5ab5484e2cb8c298e3041dc8100b0920eab25d8fbd3dd89a585786 SHA512 187777139b2c07408ee0fcf62380add34347c56b843d4d6d87fa5934c85b026b7905206fee26c24a6b7607238539fa9c05956970557757876544924ac51e9e22
 AUX kicad-boost-1.61.patch 9565 BLAKE2B edfafc5a9ef70ace413f7b1fb1c0a47fb4abc4bd52f0ec085d5449b5dc7bea454f16e809ea0c12a274f809bd52549507aefee6e34c9f32bf341449e6de2c87cf SHA512 a960117a4c08144de5111e76a33f208a9b3fe702d10ec2546afc57faf3de3fccfe19b5a5c62b527953d55687e644ed67c9b560cd3baf8b678d127977f3f30cee
+AUX kicad-cmake-checkcxxsymbolexists.patch 2353 BLAKE2B 38d173c8c47c623b1c2f62b58367fe8536d9349ac1a6c64368b481921b1477d73a126e2be6806b0a5f4404a586a318ca685a67ecac30ebc1a402c518d65680da SHA512 3d11ebd04dcd3b4f08de3b8c2f3e2d5b5022421caea4ca69ab22f45865f6ead5196bb5bc423761679f9259030cc2c8958cc27d9309a8485c69f5ef7393e330cc
 AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6daa107501152d4e3bc6f7f38dfd99405cf11da67df923df415657b84d50d4ef4f608307b2de23cc7458d8abc4cc03b9d8 SHA512 d101e28f8f5f00946a23839193bf83379da121d36bcf67f25b14b02cb5c2a4ff9a392db5b3676687bd26c0d61453313ce704192dd1e4e73834eb9930a07ee822
 DIST kicad-4.0.4-i18n.tar.gz 2409039 BLAKE2B 95e0e8c8b001957df1f244ba5fef5b36658c75b3c903b495faab8c8ccb524d02dbb79b0197fa0485fc5f93a5a0088861bada57cd85d7982191437bdf8f7b1f3c SHA512 5fcbf54aeff92c142652908dda9e727e8b076aec4531f2bb4d27aa9fd946e92621141a9709a9469c133010cca019e4e6bc9731366e8c1adbe38078f5a6fcaedf
 DIST kicad-4.0.4.tar.xz 10672424 BLAKE2B 16bef2545e697757be270eeff6820e75b1a79a37528f264e127587131c519cbdf67a774a4a9a8ff32c90b236279746ffd2164cb4d8885dc68d2664ef3dd178de SHA512 230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242
@@ -19,7 +20,7 @@ DIST kicad-library-4.0.5.tar.gz 91081668 BLAKE2B 7bd7c765b62170173e35dbe0583ae3f
 DIST kicad-library-4.0.6.tar.gz 175137480 BLAKE2B 377b350c7a19164608eb244326b07dff59e817198d390c820cca3594477658e43a9699795bc9f45b4651395b02d98c9a12e3b8f8de0e4b324090e08d6f0b8629 SHA512 4c35ce045a59c289e54cf8f634b22e59c272d79f4db047a0049085793b70ce659aba7bdba182f03e7081e65d0921af380aa9ca84eff4d3ec8644822d161ba425
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
 EBUILD kicad-4.0.4.ebuild 7381 BLAKE2B a0368f595f54dcaf15d4053be3be8cfdbba40b4729f5e68700e2e970792eeba8b50e8eadd2c2e84de3fd6831f5d0a004ee8128c06809851c11bd6eea8fbb49a8 SHA512 c7784cab7473803eb7c51b62fe09c48d38b1f27dc9b33382cd5a7194fc08572f2024aa8d4564ff2f51eb1b1e651eadf6e389ee25b7d01eb2953ca04bc7a2d3c4
-EBUILD kicad-4.0.5-r1.ebuild 6699 BLAKE2B 485bb6f15445c0873509fa6ad0840d243d0b28da578b96fd85f49edd6ac50d6962774248057c8ae268e6fd39ef5b7bf929bb14acd9a149fab6d5f60daf0ac8b8 SHA512 f5636852943e2d65d4121395a6fb97fa49a71b6947c8d5d3a66f322c46962aeab06c41aac4770af01eaa98142698843ddf6ca14f8681994a774112b6bdf68b8e
-EBUILD kicad-4.0.6.ebuild 6699 BLAKE2B 485bb6f15445c0873509fa6ad0840d243d0b28da578b96fd85f49edd6ac50d6962774248057c8ae268e6fd39ef5b7bf929bb14acd9a149fab6d5f60daf0ac8b8 SHA512 f5636852943e2d65d4121395a6fb97fa49a71b6947c8d5d3a66f322c46962aeab06c41aac4770af01eaa98142698843ddf6ca14f8681994a774112b6bdf68b8e
-EBUILD kicad-4.0.7.ebuild 6604 BLAKE2B f45e996a806ed15733022ceefc4a33aec4d670e5fdd9c41db312d8ef25c0d638ecc063cfbb237bb6d5b1b822850143a41b11d8c8b1615b2dde63eea24033e94e SHA512 9d10109976cdaa839c503758e2e329cdcc3bffc34eb9cb1bde6a382cd1f726d7455c04ffbbde1b74d3796be4d4227ee91dbe668540dd6a56c28e44248c392292
+EBUILD kicad-4.0.5-r1.ebuild 6777 BLAKE2B 32fdc50a488d5bffd35ab67fdbbfa67e2b065eb6f5a7e3b177b7c3eafb3a9a1820cbee1131802d1d5b4dd5e5920f954b85ce684e52463c034445c057ef06f459 SHA512 272117844daec0efeba4e4e8ab9b7feeed14db257b6ff2e03cd9be0ec2d10de5e5fa89b6d9604b3f2782b3297ce1ceb5de06c7b84ac753f4509b665adcfc1d59
+EBUILD kicad-4.0.6.ebuild 6777 BLAKE2B 32fdc50a488d5bffd35ab67fdbbfa67e2b065eb6f5a7e3b177b7c3eafb3a9a1820cbee1131802d1d5b4dd5e5920f954b85ce684e52463c034445c057ef06f459 SHA512 272117844daec0efeba4e4e8ab9b7feeed14db257b6ff2e03cd9be0ec2d10de5e5fa89b6d9604b3f2782b3297ce1ceb5de06c7b84ac753f4509b665adcfc1d59
+EBUILD kicad-4.0.7.ebuild 6657 BLAKE2B 2a364a089bc42ba9ba7b52b88cecc1724bc27fec1c271835636ac28355af3ceeded0c54acc877f85988fea7c151c160d335827cccc48447056e877e5d33fea43 SHA512 3022c0051d507758747ae86b1e2f0276cad1981b22e99cdb06a7b2e7243b0606545d9223ea7efeabc2afbc941cf08804f980840e3464d0d811d05a6a85f5c4c0
 MISC metadata.xml 971 BLAKE2B 7f048f2b1d87a7590f0d2bee633f18913e735253b5c6bf209e95ed250c3b0071032860ada3482d52140acf249958b0266748c3367cf71b3ce7a8e1f0148deb54 SHA512 17e95b02c75fb0b36ef3e9f4ab4cc04e98bfb42481cc45f6860f8767cdc56941a140b2f0a417fde62e4644e386439eccc9d04f652914f01701d6c6e4ee86795f
diff --git a/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch b/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch
new file mode 100644
index 000000000000..b2a1eeb2cc42
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch
@@ -0,0 +1,46 @@
+diff -Naur kicad-4.0.7.orig/CMakeModules/CheckCXXSymbolExists.cmake kicad-4.0.7/CMakeModules/CheckCXXSymbolExists.cmake
+--- kicad-4.0.7.orig/CMakeModules/CheckCXXSymbolExists.cmake	2017-08-28 07:31:31.000000000 -0700
++++ kicad-4.0.7/CMakeModules/CheckCXXSymbolExists.cmake	1969-12-31 16:00:00.000000000 -0800
+@@ -1,42 +0,0 @@
+-# - Check if a symbol exists as a function, variable, or macro in C++
+-# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>)
+-#
+-# Check that the <symbol> is available after including given header
+-# <files> and store the result in a <variable>.  Specify the list
+-# of files in one argument as a semicolon-separated list.
+-# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed
+-# to CHECK_SYMBOL_EXISTS(), which works only for C.
+-#
+-# If the header files define the symbol as a macro it is considered
+-# available and assumed to work.  If the header files declare the
+-# symbol as a function or variable then the symbol must also be
+-# available for linking.  If the symbol is a type or enum value
+-# it will not be recognized (consider using CheckTypeSize or
+-# CheckCSourceCompiles).
+-#
+-# The following variables may be set before calling this macro to
+-# modify the way the check is run:
+-#
+-#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+-#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+-#  CMAKE_REQUIRED_INCLUDES = list of include directories
+-#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+-
+-#=============================================================================
+-# Copyright 2003-2011 Kitware, Inc.
+-#
+-# Distributed under the OSI-approved BSD License (the "License");
+-# see accompanying file Copyright.txt for details.
+-#
+-# This software is distributed WITHOUT ANY WARRANTY; without even the
+-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-# See the License for more information.
+-#=============================================================================
+-# (To distribute this file outside of CMake, substitute the full
+-#  License text for the above reference.)
+-
+-include(CheckSymbolExists)
+-
+-macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
+-  _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
+-endmacro()
diff --git a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
index da56b49911ba..2e59e1a1d631 100644
--- a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,9 +62,12 @@ pkg_setup() {
 
 src_prepare() {
 	xdg_src_prepare
+	cmake-utils_src_prepare
 
 	# Patch to work with >=boost 1.61
 	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
+	# Patch to work with >=cmake 3.11
+	eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
 
 	# Remove cvpcb desktop file as it does nothing
 	rm "resources/linux/mime/applications/cvpcb.desktop" || die
@@ -127,8 +130,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DKICAD_DOCS="/usr/share/doc/${PF}"
-		-DKICAD_HELP="/usr/share/doc/${PF}/help"
-		-DwxUSE_UNICODE=ON
 		-DKICAD_SKIP_BOOST=ON
 		-DBUILD_GITHUB_PLUGIN="$(usex github)"
 		-DKICAD_SCRIPTING="$(usex python)"
@@ -138,6 +139,7 @@ src_configure() {
 		-DCMAKE_CXX_FLAGS="-std=c++11"
 	)
 	use python && mycmakeargs+=(
+		-DwxUSE_UNICODE=ON
 		-DPYTHON_DEST="$(python_get_sitedir)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
diff --git a/sci-electronics/kicad/kicad-4.0.6.ebuild b/sci-electronics/kicad/kicad-4.0.6.ebuild
index da56b49911ba..2e59e1a1d631 100644
--- a/sci-electronics/kicad/kicad-4.0.6.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,9 +62,12 @@ pkg_setup() {
 
 src_prepare() {
 	xdg_src_prepare
+	cmake-utils_src_prepare
 
 	# Patch to work with >=boost 1.61
 	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
+	# Patch to work with >=cmake 3.11
+	eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
 
 	# Remove cvpcb desktop file as it does nothing
 	rm "resources/linux/mime/applications/cvpcb.desktop" || die
@@ -127,8 +130,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DKICAD_DOCS="/usr/share/doc/${PF}"
-		-DKICAD_HELP="/usr/share/doc/${PF}/help"
-		-DwxUSE_UNICODE=ON
 		-DKICAD_SKIP_BOOST=ON
 		-DBUILD_GITHUB_PLUGIN="$(usex github)"
 		-DKICAD_SCRIPTING="$(usex python)"
@@ -138,6 +139,7 @@ src_configure() {
 		-DCMAKE_CXX_FLAGS="-std=c++11"
 	)
 	use python && mycmakeargs+=(
+		-DwxUSE_UNICODE=ON
 		-DPYTHON_DEST="$(python_get_sitedir)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7.ebuild
index 5f15284ffd5d..d7108063bd58 100644
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.7.ebuild
@@ -72,6 +72,8 @@ src_prepare() {
 
 	# Patch to work with >=boost 1.61
 	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
+	# Patch to work with >=cmake 3.11
+	eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
 
 	# Remove cvpcb desktop file as it does nothing
 	rm "resources/linux/mime/applications/cvpcb.desktop" || die
@@ -128,8 +130,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DKICAD_DOCS="/usr/share/doc/${PF}"
-		-DKICAD_HELP="/usr/share/doc/${PF}/help"
-		-DwxUSE_UNICODE=ON
 		-DKICAD_SKIP_BOOST=ON
 		-DBUILD_GITHUB_PLUGIN="$(usex github)"
 		-DKICAD_SCRIPTING="$(usex python)"
@@ -139,6 +139,7 @@ src_configure() {
 		-DCMAKE_CXX_FLAGS="-std=c++11"
 	)
 	use python && mycmakeargs+=(
+		-DwxUSE_UNICODE=ON
 		-DPYTHON_DEST="$(python_get_sitedir)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"