sci-electronics/kicad: Bump to 5.1.6

Additionally updated to new source URI, and updated some patches.

Bug: https://bugs.gentoo.org/723406
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zoltan Puskas <zoltan@sinustrom.info>
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

4 files changed, 228 insertions, 0 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 5b38dbd3a147..ecfc7f310565 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,5 +4,6 @@ DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B 182b2e2d3ddef3d8cae1552b869427b5d63082a
 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-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
+DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f SHA512 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
 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
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
new file mode 100644
index 000000000000..675ff749de8d
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
@@ -0,0 +1,30 @@
+diff -Naur kicad-5.1.6-orig/CMakeLists.txt kicad-5.1.6/CMakeLists.txt
+--- kicad-5.1.6-orig/CMakeLists.txt	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/CMakeLists.txt	2020-05-25 20:45:57.199559075 -0700
+@@ -929,7 +929,7 @@
+     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
+     set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
+     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
+-    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/appdata )
++    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/metainfo )
+ 
+     # Install Mime directory
+     install( DIRECTORY ${UNIX_ICON_FILES}
+diff -Naur kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake
+--- kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake	2020-05-25 20:54:51.927438936 -0700
+@@ -36,11 +36,11 @@
+ string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" )
+ 
+ # Configure the KiCad appdata file
+-configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/appdata/kicad.appdata.xml.in
+-                ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml
++configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/metainfo/kicad.appdata.xml.in
++                ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml
+                 @ONLY )
+ 
+ # Ensure the file was configured successfully
+-if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml )
++if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml )
+     message( FATAL_ERROR "Configuration failed to write file kicad.appdata.xml." )
+ endif()
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch b/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
new file mode 100644
index 000000000000..baff144fbd85
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
@@ -0,0 +1,45 @@
+diff -Naur kicad-5.1.6-orig/pcbnew/CMakeLists.txt kicad-5.1.6/pcbnew/CMakeLists.txt
+--- kicad-5.1.6-orig/pcbnew/CMakeLists.txt	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/pcbnew/CMakeLists.txt	2020-05-25 20:57:03.387859088 -0700
+@@ -805,11 +805,7 @@
+         add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation )
+         set( PYMOD_EXT "so" )
+     else()  # only linux remains among supported platforms
+-        add_library( pcbnew_python MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
+-        target_link_libraries( pcbnew_python ${PCBNEW_KIFACE_LIBRARIES} )
+-        set_target_properties( pcbnew_python PROPERTIES OUTPUT_NAME pcbnew PREFIX "_" SUFFIX ".so" )
+-        install( TARGETS pcbnew_python DESTINATION ${PYTHON_DEST} COMPONENT binary )
+-
++        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" )
+         set( PYMOD_EXT "so" )
+     endif()
+ 
+@@ -824,18 +820,16 @@
+             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
+             )
+     else()
+-
+-
+-    # For phase 1, copy _pcbnew.kiface to the python module.
+-    add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
+-        DEPENDS pcbnew_kiface
+-        COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
+-        COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
+-        )
+-    add_custom_target(
+-        pcbnew_python_module ALL
+-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
+-        )
++        # For phase 1, copy _pcbnew.kiface to the python module.
++        add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
++            DEPENDS pcbnew_kiface
++            COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
++            COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
++            )
++        add_custom_target(
++            pcbnew_python_module ALL
++            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
++            )
+     endif()
+ 
+ endif()
diff --git a/sci-electronics/kicad/kicad-5.1.6.ebuild b/sci-electronics/kicad/kicad-5.1.6.ebuild
new file mode 100644
index 000000000000..2542a2bc1f2f
--- /dev/null
+++ b/sci-electronics/kicad/kicad-5.1.6.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit check-reqs cmake eutils python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad-pcb.org"
+SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples github +ngspice occ +oce openmp +python"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( occ oce )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.61:=[context,nls,threads]
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	github? ( net-misc/curl:=[ssl] )
+	ngspice? (
+		>sci-electronics/ngspice-27[shared]
+	)
+	occ? ( >=sci-libs/opencascade-6.8.0:= )
+	oce? ( sci-libs/oce )
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
+			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	python? ( >=dev-lang/swig-3.0:0 )"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+CHECKREQS_DISK_BUILD="800M"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.5-help.patch"
+	"${FILESDIR}/${P}-ninja-build.patch"
+	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
+	"${FILESDIR}/${PN}-5.1.5-algorithm-header.patch"
+	"${FILESDIR}/${P}-metainfo.patch"
+	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use openmp && tc-check-openmp
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	default_src_unpack
+	# For the metainfo patch to work the kicad.appdata.xml has to be moved to
+	# avoid QA issue.  This is needed because /usr/share/appdata location is
+	# deprecated, it should not be used anymore by new software.
+	# Appdata/Metainfo files should be installed into /usr/share/metainfo
+	# directory. as per
+	# https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
+		-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)"
+		-DCMAKE_SKIP_RPATH="ON"
+	)
+	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_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile dev-docs doxygen-docs
+	fi
+}
+
+src_install() {
+	cmake_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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}