sci-electronics/kicad: Fix build issue with dev-libs/boost-1.61

Boost in 1.61 removed context API. Kicad developers had a patch,
that was autogenerated from boost and replaces context library.

Gentoo bug: #583640

Package-Manager: portage-2.3.0_rc1

3 files changed, 309 insertions, 0 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 7d23793825cf..aba1b59e88a3 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -6,3 +6,4 @@ DIST kicad-4.0.2-library.tar.gz 105106185 SHA256 0499da0fa617248a4196e50ff65c0bf
 DIST kicad-4.0.2.tar.xz 10841200 SHA256 2eae6986843a29862ab399a30b50454582d22f58ed3f53eb50d0c85e5d488eb9 SHA512 b0817cca7b8d0216507d78c602d332deaf2a68528b129309067b01e254c6600af5513dea7f44570beb4a339bc044ef7966890a91aeda6fd5a95515657cd1628a WHIRLPOOL 7ae9b072addeea8cc3d6daa69b8f19d077604f0ec5d1e5dfed53efe6b0a32f6b12c1156c2f52092a859d9f716cab83d16b17b0e3abbc0c72a2bafacb3be27719
 DIST kicad-footprints-4.0.1.tar.gz 801985 SHA256 e3b195706c8f30928c34478a87607e996def94a19982f8987a783b8e4ffe112f SHA512 4fef1792eee8be951c77a8684942ecfa9047b602796f90e746010d63f72f5981cb2c90efe28ba7bd7d22894256d23f71b47eb170056e7b4423f72120f5413725 WHIRLPOOL b41eb7149b14af4c3dd37bc19f7bba9afcc896c1b5d523e7bead0c6695dad7255527f952042589181876dc598d7a85963ab4f86b6c3179e0e82e6f187712c298
 DIST kicad-footprints-4.0.2.tar.gz 802003 SHA256 eff257abc2d5e4b1b87b2251c74b5c751271505c0605f31f8f4390dedff43f6f SHA512 2b54bbbcaac8ae17f9b27f2ba2542be10a84fda46266dfa249699d731ceb3de1c8129bcd1e88f045b2fb20af9a58658ef65390ea702e7c583923a50b10cd5a29 WHIRLPOOL bf9f9475092eb6a9167d5297731942c9f0ad48a49ba05d04db400cff64c46a413ffec68d524f39edbfee05fb55216da5b69dd2c1f409e955cb0758da1383b140
+DIST kicad-libcontext.tar.gz 25599 SHA256 37be6072a6016d402b4341e2ceba719cdd8e279e275ea7275d91e19e813a31a3 SHA512 3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9 WHIRLPOOL d05f43544fa4c9d1fae957445782ad610c07564db81c12491fe6aeaf6948a369b3f55114eacb21916fbc9001f20d0a2c4944c3ab0ccc8e57bf9aa44fea507087
diff --git a/sci-electronics/kicad/files/kicad-boost-context.patch b/sci-electronics/kicad/files/kicad-boost-context.patch
new file mode 100644
index 000000000000..00e80f3fb13e
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-boost-context.patch
@@ -0,0 +1,107 @@
+diff -Naur kicad-4.0.2-orig/common/system/libcontext.cpp kicad-4.0.2/common/system/libcontext.cpp
+--- kicad-4.0.2-orig/common/system/libcontext.cpp       2016-06-16 22:30:58.000000000 -0700
++++ kicad-4.0.2/common/system/libcontext.cpp    2016-06-16 22:35:46.654719468 -0700
+@@ -13,7 +13,7 @@
+             http://www.boost.org/LICENSE_1_0.txt)
+
+ */
+-#include "libcontext.h"
++#include <system/libcontext.h>
+ #if defined(LIBCONTEXT_PLATFORM_windows_i386) && defined(LIBCONTEXT_COMPILER_gcc)
+ __asm (
+ ".text\n"
+diff -Naur kicad-4.0.2-orig/CMakeLists.txt kicad-4.0.2/CMakeLists.txt
+--- kicad-4.0.2-orig/CMakeLists.txt	2016-02-13 13:14:42.000000000 -0800
++++ kicad-4.0.2/CMakeLists.txt	2016-06-11 01:11:25.623484908 -0700
+@@ -561,7 +561,7 @@
+ # Download boost and possibly build parts of it

+ #################################################

+ if( KICAD_SKIP_BOOST )

+-    find_package( Boost 1.54.0 REQUIRED COMPONENTS context date_time filesystem iostreams locale

++    find_package( Boost 1.54.0 REQUIRED COMPONENTS date_time filesystem iostreams locale

+                                                    program_options regex system thread )

+ 

+     if( NOT Boost_FOUND )

+diff -Naur kicad-4.0.2-orig/common/CMakeLists.txt kicad-4.0.2/common/CMakeLists.txt
+--- kicad-4.0.2-orig/common/CMakeLists.txt	2016-02-13 13:14:42.000000000 -0800
++++ kicad-4.0.2/common/CMakeLists.txt	2016-06-11 01:10:04.886830434 -0700
+@@ -256,6 +256,8 @@
+     view/view_item.cpp

+     view/view_group.cpp

+ 

++    system/libcontext.cpp

++

+     math/math_util.cpp

+ 

+     tool/tool_action.cpp

+diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h kicad-4.0.2/include/tool/coroutine.h
+--- kicad-4.0.2-orig/include/tool/coroutine.h	2016-02-13 13:14:42.000000000 -0800
++++ kicad-4.0.2/include/tool/coroutine.h	2016-06-11 01:07:06.035378422 -0700
+@@ -27,8 +27,7 @@
+ 

+ #include <cstdlib>

+ 

+-#include <boost/context/fcontext.hpp>

+-#include <boost/version.hpp>

++#include <system/libcontext.h>

+ 

+ #include "delegate.h"

+ 

+@@ -92,10 +91,8 @@
+         if( m_saved )

+             delete m_saved;

+ 

+-#if BOOST_VERSION >= 105600

+         if( m_self )

+             delete m_self;

+-#endif

+ 

+         if( m_stack )

+             free( m_stack );

+@@ -156,13 +153,9 @@
+         assert( m_saved == NULL );

+ 

+         m_args = &aArgs;

+-#if BOOST_VERSION >= 105600

+-        m_self = new boost::context::fcontext_t();

+-        *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );

+-#else

+-        m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );

+-#endif

+-        m_saved = new boost::context::fcontext_t();

++        m_self = new fcontext_t();

++        *m_self = make_fcontext( sp, m_stackSize, callerStub );

++        m_saved = new fcontext_t();

+ 

+         m_running = true;

+         // off we go!

+@@ -222,14 +215,10 @@
+     }

+ 

+     ///> Wrapper for jump_fcontext to assure compatibility between different boost versions

+-    static inline intptr_t jump(boost::context::fcontext_t* aOld, boost::context::fcontext_t* aNew,

++    static inline intptr_t jump(fcontext_t* aOld, fcontext_t* aNew,

+                                 intptr_t aP, bool aPreserveFPU = true )

+     {

+-#if BOOST_VERSION >= 105600

+-        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );

+-#else

+-        return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );

+-#endif

++        return jump_fcontext( aOld, *aNew, aP, aPreserveFPU );

+     }

+ 

+     template <typename T>

+@@ -252,10 +241,10 @@
+     ReturnType m_retVal;

+ 

+     ///< saved caller context

+-    boost::context::fcontext_t* m_saved;

++    fcontext_t* m_saved;

+ 

+     ///< saved coroutine context

+-    boost::context::fcontext_t* m_self;

++    fcontext_t* m_self;

+ 

+     ///< coroutine stack

+     void* m_stack;

diff --git a/sci-electronics/kicad/kicad-4.0.2-r2.ebuild b/sci-electronics/kicad/kicad-4.0.2-r2.ebuild
new file mode 100644
index 000000000000..b0670c63a6ef
--- /dev/null
+++ b/sci-electronics/kicad/kicad-4.0.2-r2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 vcs-snapshot wxwidgets versionator xdg
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+LIBCONTEXT_COMMIT="3d92a1a50f4749b5a92131a957c9615473be85b4"
+
+SERIES=$(get_version_component_range 1-2)
+
+SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
+	http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
+	!minimal? ( https://github.com/KiCad/${PN}-library/archive/${PV}.tar.gz -> ${P}-library.tar.gz )
+	i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )
+	https://github.com/twlostow/libcontext/archive/${LIBCONTEXT_COMMIT}.tar.gz -> ${PN}-libcontext.tar.gz"
+
+LICENSE="GPL-2 GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples github i18n minimal +python webkit"
+LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh_CN"
+for lang in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+unset lang
+unset LANGS
+
+REQUIRED_USE="
+	github? ( webkit )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
+	python? (
+		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	>=dev-libs/boost-1.56[nls,threads,python?]
+	github? ( dev-libs/openssl:0 )
+	media-libs/glew
+	media-libs/freeglut
+	media-libs/mesa
+	sys-libs/zlib
+	x11-libs/cairo"
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
+	i18n? ( virtual/libintl )
+	python? ( dev-lang/swig:0 )
+	app-text/dos2unix"
+RDEPEND="${CDEPEND}
+	sci-electronics/electronics-menu"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add separated out libcontext files and patch source to use them
+	mkdir -p "${S}/common/system/" || die "mkdir failed"
+	mkdir -p "${S}/include/system/" || die "mkdir failed"
+	cp "${WORKDIR}/${PN}-libcontext/libcontext.cpp" "${S}/common/system/libcontext.cpp" || die "cp failed"
+	cp "${WORKDIR}/${PN}-libcontext/libcontext.h" "${S}/include/system/libcontext.h" || die "cp failed"
+	# Path source to use new "built in" libcontext. Also patch libcontext.cpp to have correct include file.
+	# Path must be applied after new libcontext files have been copied to the kicad source directory.
+	epatch "${FILESDIR}/${PN}-boost-context.patch"
+
+	# remove all the non unix file endings
+	find "${S}" -type f -name "*.desktop" | xargs -n1 dos2unix
+	assert "dos2unix failed"
+
+	# Handle optional minimal install.
+	if use minimal; then
+		# remove templates as they are not needed to run binaries
+		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die "sed failed"
+	else
+		# create a link to the parts library in the main project folder
+		ln -s "${WORKDIR}/${P}-library" "${S}/${PN}-library" || die "ln failed"
+		# create a link to the footprints library and add cmake build rule for it
+		ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die "ln failed"
+		cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die "cp failed"
+		# add the libraries directory to cmake as a subproject to build
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die "sed failed"
+		# add the footprints directory to cmake as a subproject to build
+		sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( ${PN}-footprints )" -i CMakeLists.txt || die "sed failed"
+		# remove duplicate uninstall directions for the library module
+		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add internationalization for the GUI
+	if use i18n; then
+		# create a link to the translations library in the main project folder
+		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die "ln failed"
+		# Remove unused languages. Project generates only languages specified in the
+		# file in LINGUAS in the subproject folder. By default all languages are added
+		# so we sed out the unused ones based on the user linguas_* settings.
+		local lang
+		for lang in ${LANGS}; do
+			if ! use linguas_${lang}; then
+				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die "sed failed"
+			fi
+		done
+		# cmakelists does not respect our build dir variables, so make it point to the right location
+		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+		# we also make from the master project so the source dir is understood incorretly, replace that too
+		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+		# add the translations directory to cmake as a subproject to build
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die "sed failed"
+		# remove duplicate uninstall directions for the translation module
+		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Install examples in the right place if requested
+	if use examples; then
+		# install demos into the examples folder too
+		sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i CMakeLists.txt || die "sed failed"
+	else
+		# remove additional demos/examples as its not strictly required to run the binaries
+		sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add important missing doc files
+	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DKICAD_DOCS="/usr/share/doc/${PF}"
+		-DKICAD_HELP="/usr/share/doc/${PF}/help"
+		-DKICAD_REPO_NAME="stable"
+		-DKICAD_BUILD_VERSION="${PV}"
+		-DwxUSE_UNICODE=ON
+		-DKICAD_SKIP_BOOST=ON
+		$(cmake-utils_use github BUILD_GITHUB_PLUGIN)
+		$(cmake-utils_use python KICAD_SCRIPTING)
+		$(cmake-utils_use python KICAD_SCRIPTING_MODULES)
+		$(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON)
+		$(cmake-utils_use webkit KICAD_USE_WEBKIT)
+		$(usex i18n "-DKICAD_I18N_UNIX_STRICT_PATH=1" "")
+	)
+	if use debug; then
+		append-cxxflags "-DDEBUG"
+		append-cflags "-DDEBUG"
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die "cd failed"
+		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+
+	if use minimal ; then
+		ewarn "If the schematic and/or board editors complain about missing libraries when you"
+		ewarn "open old projects, you will have to take one or more of the following actions :"
+		ewarn "- Install the missing libraries manually."
+		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
+		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
+		ewarn "- Emerge ${PN} without the 'minimal' USE flag."
+	fi
+	elog ""
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+	elog "For help and extended documentation emerge app-doc/kicad-doc."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}