gentoo resync : 18.08.2019

7 files changed, 155 insertions, 8 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index a183145c0000..c8e2606b2082 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,6 +1,7 @@
 AUX kicad-5.0.0-curl.patch 568 BLAKE2B 6a6d4d382f014fa57a5af8af27e6090f4c9e7b8c9454ee09f039c472f0089f0d9cb045d435b5193d6da4fa2a24dd5a859f7905b330d9bbbd5b0fa4cf116e8512 SHA512 dcb7a260f5acda58dcfdddd59920df02b8003b1727728c90076770fc67b4e7c47050b915e3d634612077b66d1ff62b6409111ee1003c443f48ea6356eeb59841
 AUX kicad-5.0.0-help.patch 4683 BLAKE2B 6b3e3d3567e0f554346ad2eb30b3af9e7ab07e77da2675513dd040e85011f6e711701c0cf3909399f4fe2298d7d59e71727583240d3e06701c18b4c2f59090ef SHA512 570fb711ffb18c7201e7a75791d1cc370493975d19e125de1ff6a78107b5fb70868975efd7d2a8ec921190484f7f91f723cca52337ec2e36f860b73dcedc3e7b
 AUX kicad-5.1.0-help.patch 4690 BLAKE2B 5459e3e7fde22590f4357ec3981c9bc2d784f533cc0370befb6851fb01954923722c815aaafa4dcd37f15c74bc31fd3b711ac106301abeb195dedc8086965c47 SHA512 ed5c70b0157ff4db152e2374df669210b194147655c7c5083ffb2f5ce56358c30c4cb2aaff2368f3a34757e5a5021b335ce169727eaaf511b12d1ceb3fb9a350
+AUX kicad-5.1.0-swig-4.0.0.patch 623 BLAKE2B 66d3974741793b84a192d9223e739deddc544c230a8618aa78db1fe48bec1a632cb07bfcdb0b01137c1b1e4cb7d5fda4330c7cb717ea894d6279660752056e7b SHA512 c43552d6da296cbc11232f565a9525fc707304e9a823e4e003d998f4ef013d82708c7b17b4bcef82c661e0f53e849d372c089a077a356b006db3523ffe82892a
 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
@@ -9,10 +10,12 @@ DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e7
 DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B 47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7 SHA512 36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d
 DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B 182b2e2d3ddef3d8cae1552b869427b5d63082aeaa1d3bd15d977c5421084fa6134f8d244a3024b46aa56c98c8412d3f1ba8f72b40c73ab9bfebea7535a8a4ad SHA512 644865932d7e18e446c222cd85e969bb3462bca7fbf6c411e955cd460f5df45ed5221c0948ecd34262a2f5355e586c8fe04c1cb28fa51e4fd09d6f3f78c54761
 DIST kicad-5.1.2.tar.xz 14191500 BLAKE2B f25de921a8f412dd52ad7afe31c95e3db5d497126925cb024ba31519b1bc1acdc573c4465aaee0b4acf73002100361bb95e4ca325b5199717f1827480d7e1f6e SHA512 5280be13d82d675aecab208f6d05ac8ac31a8f4d620c541748a1c519f8587b0250f189d8c5cdc0d7fa19b52780e5c68bb3e1956a3f303bb183bfb4c59062be1b
+DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B 99d317df6f2446611614c8d4294b4f8ff81082d2d74d701b616225c5667f96dd5a5bc47511e1af869351af3707244a6d660ff6a3257fe70e1e15df67c8d9fa3b SHA512 ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
-EBUILD kicad-4.0.7.ebuild 6655 BLAKE2B d5b54ce74ca3028d62c6d4ebf52992c7bf12eb2f5c519ed487914d1763ab3589f3cfd831f79f3080d95b85c157296c85aea78990e44f497656208431a3b6d3f0 SHA512 16f19bcb4fd206a24ab06f049b86aa6f1724bd8d0bfdebd804cc1eb50109f00b7ad7b9327d20abefb3527ff962e76c46640854d6bb2c393317c876e9d9e64625
-EBUILD kicad-5.0.1.ebuild 3462 BLAKE2B c15ef73ec7bd3522522fc61e274ecbfd6ea3110829dae3afe8e64516147a1d513354b09c67e6728b4216ab4ac5f9753495770ed50577a9ef3628aaac73da7b28 SHA512 3914612ebf357708a24524c24b7e9442019baa32c98f339d6b5b1cf9a7d5c611f0c257b126a01dbf135efdfd604a2793ad5ca97ec3fab59034a81126f6ea3f75
-EBUILD kicad-5.1.0.ebuild 3493 BLAKE2B 1298dbbcd0682a881ba56afd82ab8e4887d6f0a5b10942feace1af116095bbcafcfe1b11de375ec6d24fa89d32c7c2066d84eb4aba303347c36f251d015b7a03 SHA512 a95da3de07e43c4337ccc7bc717901633337d56be34c77fc01993275dc6e96fe991bcbf882ea546c34f6bcbfe5bcaa323563540d695f6bb81f21e6886e4c2c5e
-EBUILD kicad-5.1.2.ebuild 3571 BLAKE2B e4dd2286a9baee4ea2d65e75acc20f5b9a406c3000f69f882ac24389eec0aafbdd75045057041b6d7afcc69e597ed5dd93a4c88a2e4c594ceadf0d3f740fc42f SHA512 771eb7a214f54f98a6a1b83b3b8db327c7081f42274bb9d374c3727436ac25f0935c800002ec31208b9b4be25b33796b986f55bc0c314468364551f5a969368e
+EBUILD kicad-4.0.7.ebuild 6661 BLAKE2B 2b34abec43c309038343b5e14f993d0eb637a6b01dc1eb3b8e8d58b9bb70adf1872417880d1bf4d5461329cfdce3101eacbc50a77bf6550138341fcf0e1dfb42 SHA512 885a5a2bc8e49d7894aaca5c235b1de58959b4d5cf878154d668084305d3286641146f69c670c24d4c876afc4538526543de9d9423fce2d6e05cf9b70a32b089
+EBUILD kicad-5.0.1.ebuild 3468 BLAKE2B 66776730d8e107d6b157535518890c2cd53051ffe3718ebec9646e73cfceecc76dc3d5e131a35b2da7ea711964afd5eddb7a961812a755fd5233f2d475a748e2 SHA512 bec62f8ddd9e5d2b5a53c1133ee3385183566e82504c6ae2ca3ff99a8459396d31955d1289afa257466f4d30b9bdf0dac55735c354bc7227ac2729e362cef8af
+EBUILD kicad-5.1.0-r1.ebuild 3545 BLAKE2B 38c8bc62db3d95a2071e455701242f9bad695fb1b0c26a7e4c109a03d08883c8ced8fa5565da772394e71463c991ce479fc36acf5e570c38e328ebddd578af60 SHA512 05d189041d440111986af78ed82db50fe729cd25849e1d4e172d9529593be0abf773e00b295cde247cbad926a27b20b1e76774afa8f08c813bc9ef4faa0ac242
+EBUILD kicad-5.1.2-r1.ebuild 3623 BLAKE2B b61c9dcbf5d62aae53ef2284656d8447ae154399504249acc098fa14957dd6ddd5ea9b2d49ca1e85f0fc044906afa86734aca7efeacd42a43a7fc5f6016b97a9 SHA512 33f7df8e2b50a8f1c726fbd22a4597483565684f2ea216e1ff46af2a92ea12dbea61a08434a5dd10a0639b28fc1b79ca4e8295cef51e9729ab88648966a8211b
+EBUILD kicad-5.1.4.ebuild 3577 BLAKE2B 4753f48246d5ffcc97dbbf5558555c931aa17ae89785d62456f104f0073454ad812bd7021004622c815f5623d51ab13476ca1745269780130394441b478c11e4 SHA512 e23ae92c9f5a4be3cc72176849fe6e802e8def876356a3f228103fe634f9f737fe5d1a749633d1f7b5f01fa3c35c6261e50f3b92dcac5f483ec084a24829f2df
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
new file mode 100644
index 000000000000..3ab6677e5e18
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
@@ -0,0 +1,12 @@
+--- a/scripting/build_tools/fix_swig_imports.py	2019-04-22 23:14:54.000000000 +0200
++++ b/scripting/build_tools/fix_swig_imports.py	2019-07-18 15:44:24.255754237 +0200
+@@ -40,6 +40,9 @@
+ txt = b""
+ 
+ for l in lines:
++    if l.startswith(b"if _swig_python_version_info < (2, 7, 0):"):     # ok with swig version >= 4.0.0
++        l = l.replace(b"_swig_python_version_info < (2, 7, 0)", b"False")
++        doneOk = True
+     if l.startswith(b"if _swig_python_version_info >= (2, 7, 0):"):     # ok with swig version >= 3.0.10
+         l = l.replace(b"_swig_python_version_info >= (2, 7, 0)", b"False")
+         doneOk = True
diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7.ebuild
index dd5b21104e16..2ed5780e7a1f 100644
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.7.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	)
 	media-libs/glew:0=
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-libs/zlib
 	x11-libs/cairo"
 DEPEND="${COMMON_DEPEND}
diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
index 5d1508385fdd..e04b292fa1ee 100644
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-5.0.1.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)
diff --git a/sci-electronics/kicad/kicad-5.1.0.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index 8fca5ececb98..6780bf0336dc 100644
--- a/sci-electronics/kicad/kicad-5.1.0.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)
@@ -51,6 +51,7 @@ CHECKREQS_DISK_BUILD="800M"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}-5.1.0-help.patch"
+	"${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
 )
 
 pkg_setup() {
diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
new file mode 100644
index 000000000000..a35800d88ee9
--- /dev/null
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Can switch to EAPI=7 when wxwidgets eclass also supports it
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="http://www.kicad-pcb.org"
+SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples github +ngspice occ +oce openmp +python"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( occ oce )
+"
+
+COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	python? (
+		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	>=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}]
+	github? ( net-misc/curl:=[ssl] )
+	media-libs/glew:0=
+	media-libs/glm
+	media-libs/freeglut
+	media-libs/mesa[X(+)]
+	ngspice? (
+		sci-electronics/ngspice[shared]
+	)
+	occ? ( >=sci-libs/opencascade-6.8.0:= )
+	oce? ( sci-libs/oce )
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	python? ( >=dev-lang/swig-3.0:0 )"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+CHECKREQS_DISK_BUILD="800M"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}-5.1.0-help.patch"
+	"${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use openmp && tc-check-openmp
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}"
+		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+		-DBUILD_GITHUB_PLUGIN="$(usex github)"
+		-DKICAD_SCRIPTING="$(usex python)"
+		-DKICAD_SCRIPTING_MODULES="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
+		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
+		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+		-DKICAD_SPICE="$(usex ngspice)"
+		-DKICAD_USE_OCC="$(usex occ)"
+		-DKICAD_USE_OCE="$(usex oce)"
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	use occ && mycmakeargs+=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile dev-docs doxygen-docs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-5.1.2.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
index c739de95232c..6cf2d51c218c 100644
--- a/sci-electronics/kicad/kicad-5.1.2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.4.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)