[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2016-06-18  7:42 Jason Zaman
  0 siblings, 0 replies; 10+ messages in thread
From: Jason Zaman @ 2016-06-18  7:42 UTC (permalink / raw
  To: gentoo-commits

commit:     d926c776cd06ce6d6b25213f4172c297e053e373
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Sat Jun 11 08:24:50 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 07:30:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d926c776

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

 sci-electronics/kicad/Manifest                     |   1 +
 .../kicad/files/kicad-boost-context.patch          | 107 +++++++++++
 sci-electronics/kicad/kicad-4.0.2-r2.ebuild        | 201 +++++++++++++++++++++
 3 files changed, 309 insertions(+)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 7d23793..aba1b59 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 0000000..00e80f3
--- /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 0000000..b0670c6
--- /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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2016-06-29 17:56 Michał Górny
  0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2016-06-29 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     f228caa38719ad848fa163366c8f96a4d9ded711
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Sun Jun 26 08:07:44 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 17:56:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f228caa3

sci-electronics/kicad: Fix swig import fixer script for build, #586406

Fix the broken swig import fixer script that did not work with
newer Python versions. Also correct ebuild licensing.

Bug: https://bugs.gentoo.org/586406
Closes: https://github.com/gentoo/gentoo/pull/1745
Package-Manager: portage-2.3.0_rc1

 .../kicad/files/kicad-swig-import-helper.patch     |  31 ++++
 sci-electronics/kicad/kicad-4.0.2-r3.ebuild        | 203 +++++++++++++++++++++
 2 files changed, 234 insertions(+)

diff --git a/sci-electronics/kicad/files/kicad-swig-import-helper.patch b/sci-electronics/kicad/files/kicad-swig-import-helper.patch
new file mode 100644
index 0000000..9202acc
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-swig-import-helper.patch
@@ -0,0 +1,31 @@
+diff -Naur kicad-4.0.2-orig/scripting/build_tools/fix_swig_imports.py kicad-4.0.2/scripting/build_tools/fix_swig_imports.py
+--- kicad-4.0.2-orig/scripting/build_tools/fix_swig_imports.py	2016-02-13 13:14:42.000000000 -0800
++++ kicad-4.0.2/scripting/build_tools/fix_swig_imports.py	2016-06-26 00:49:20.336661983 -0700
+@@ -37,7 +37,19 @@
+ txt = ""
+ 
+ for l in lines:
+-    if l.startswith("if version_info >= (2,6,0):"):     # ok with swig version <= 3.0.2
++    if l.startswith("if _swig_python_version_info >= (2, 7, 0):"):     # ok with swig version >= 3.0.10
++        l = l.replace("_swig_python_version_info >= (2, 7, 0)","False")
++        doneOk = True
++    elif l.startswith("elif _swig_python_version_info >= (2, 6, 0):"):  # needed with swig version >= 3.0.10
++        l = l.replace("_swig_python_version_info >= (2, 6, 0)","False")
++        doneOk = True
++    if l.startswith("if version_info >= (2, 7, 0):"):     # ok with swig version >= 3.0.9
++        l = l.replace("version_info >= (2, 7, 0)","False")
++        doneOk = True
++    elif l.startswith("elif version_info >= (2, 6, 0):"):  # needed with swig version >= 3.0.9
++        l = l.replace("version_info >= (2, 6, 0)","False")
++        doneOk = True
++    elif l.startswith("if version_info >= (2,6,0):"):     # ok with swig version <= 3.0.2
+         l = l.replace("version_info >= (2,6,0)","False")
+         doneOk = True
+     elif l.startswith("if version_info >= (2, 6, 0):"): # needed with swig version 3.0.3
+@@ -60,6 +72,3 @@
+ 
+ 
+ exit(0)
+-
+-
+-

diff --git a/sci-electronics/kicad/kicad-4.0.2-r3.ebuild b/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
new file mode 100644
index 0000000..998e630
--- /dev/null
+++ b/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
@@ -0,0 +1,203 @@
+# 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"
+	# Patch python swig import fixer build script
+	epatch "${FILESDIR}/${PN}-swig-import-helper.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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2016-09-20 22:34 Mike Gilbert
  0 siblings, 0 replies; 10+ messages in thread
From: Mike Gilbert @ 2016-09-20 22:34 UTC (permalink / raw
  To: gentoo-commits

commit:     e8c187233e9e706c949815498b06fb7f3fb3a4ae
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Tue Sep 20 14:57:17 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 22:33:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c18723

sci-electronics/kicad: Add new 4.0.4 ebuild

Package-Manager: portage-2.3.0

Closes: https://github.com/gentoo/gentoo/pull/2377

 sci-electronics/kicad/Manifest                     |  4 ++
 ...ntext.patch => kicad-4.0.2-boost-context.patch} |  0
 ....patch => kicad-4.0.2-swig-import-helper.patch} |  0
 ...ntext.patch => kicad-4.0.4-boost-context.patch} | 56 +++++++++----------
 sci-electronics/kicad/kicad-4.0.1-r1.ebuild        |  2 +-
 sci-electronics/kicad/kicad-4.0.2-r1.ebuild        |  2 +-
 sci-electronics/kicad/kicad-4.0.2-r2.ebuild        |  4 +-
 sci-electronics/kicad/kicad-4.0.2-r3.ebuild        |  6 +-
 sci-electronics/kicad/kicad-4.0.2-r4.ebuild        |  6 +-
 .../{kicad-4.0.2-r4.ebuild => kicad-4.0.4.ebuild}  | 64 ++++++++++------------
 10 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index aba1b59..76b023c 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,6 +4,10 @@ DIST kicad-4.0.1.tar.xz 10837804 SHA256 73a9f8713ba93ce34e5f9c26e9667f33a22f4e33
 DIST kicad-4.0.2-i18n.tar.gz 2290139 SHA256 05a9a5b1c9a2aa0e0712171c5e71cc3b74c43254a7d5fdd3d3c76e32ff927bea SHA512 2021706d0e96f6a82b57b8f187b703f37c32ee6efb99323ec191de141c2bfc89b590949cdbf2eea6cc618afc84bbac9fae758fdbb088aed3ab06649279bcab21 WHIRLPOOL 0797d587ed4009bc9be6aac0b19f2cd0581e497f074e6cfd33adff6a44b68c215c06c084d8221a57a0f39e228d70e9760bf368770d2bc7bd361be1688a65ab9b
 DIST kicad-4.0.2-library.tar.gz 105106185 SHA256 0499da0fa617248a4196e50ff65c0bf78cb456bf1ca4bd6c72d956044b310bef SHA512 14f7136ded81f54fcccbb4555f77b0079d637a08b15b2fd60b729226dbc5adfb5fe7489060ba1d3b949ca1d94d95623df28cceac93ee600165598d9fd78711e7 WHIRLPOOL c5080ad602684ccdb60493745714398027af2ba09b4a2187740b89fcac923941adda80c744a12338d8c6eda07763fdae12428a8c9d06379a637e3e0ee881bef1
 DIST kicad-4.0.2.tar.xz 10841200 SHA256 2eae6986843a29862ab399a30b50454582d22f58ed3f53eb50d0c85e5d488eb9 SHA512 b0817cca7b8d0216507d78c602d332deaf2a68528b129309067b01e254c6600af5513dea7f44570beb4a339bc044ef7966890a91aeda6fd5a95515657cd1628a WHIRLPOOL 7ae9b072addeea8cc3d6daa69b8f19d077604f0ec5d1e5dfed53efe6b0a32f6b12c1156c2f52092a859d9f716cab83d16b17b0e3abbc0c72a2bafacb3be27719
+DIST kicad-4.0.4-i18n.tar.gz 2409039 SHA256 aec8121fc64985b150c0843db937a3383afe1805697f339aa73009215c1b92cf SHA512 5fcbf54aeff92c142652908dda9e727e8b076aec4531f2bb4d27aa9fd946e92621141a9709a9469c133010cca019e4e6bc9731366e8c1adbe38078f5a6fcaedf WHIRLPOOL 65c940149ab3357341b41a70f7db35695a598ade462a6fc8e602c4d1b53458fc712706e0effbc8b27b24f95510980a223cb9445b8ca8d54669dd89a65d066a2c
+DIST kicad-4.0.4.tar.xz 10672424 SHA256 6da5d3f7bc63a9c5b4d0f5e4b954411b45d712168596b5af02957343c87eda00 SHA512 230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242 WHIRLPOOL c5e577bebfd11160528e9543d9a421a5814ad70134092e9a0bd759b7a941e730b33cac7059606eba049ad5ffc8e6d44a0079bdbe9446ad1f152fa04ec6150d4c
 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-footprints-4.0.4.tar.gz 1400434 SHA256 2b23e282c64c7e72d9ad52a6f114c20572b8c0e3fd9895b9b87b7ccacc7b4479 SHA512 7d42eea2c7c84961e05e0e61d6380e3d294d696e1321bb4406391125379fd6a3dc2b38e7ff8be51b684786bed892738452218f4c5a95c547319f1eaafc0cea6e WHIRLPOOL 6f96d7ecbe94c511f99c6022466704742aec83578790685c2945926682a0a2c50f2ff176bf075b06cea4cd60fe7afbfb8c142096b6b7a1d73020f0327d1281a8
 DIST kicad-libcontext.tar.gz 25599 SHA256 37be6072a6016d402b4341e2ceba719cdd8e279e275ea7275d91e19e813a31a3 SHA512 3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9 WHIRLPOOL d05f43544fa4c9d1fae957445782ad610c07564db81c12491fe6aeaf6948a369b3f55114eacb21916fbc9001f20d0a2c4944c3ab0ccc8e57bf9aa44fea507087
+DIST kicad-library-4.0.4.tar.gz 87947075 SHA256 22c02d151aba7ea90c519fda953a8cd882d8da7e36ec0e68ed90a6e15151cdf3 SHA512 57f905277cf581cfda6ca574d87bbdd3a870cd240a151b2c8faedc7ecbfa2cc122b67937cbdbf028be77727cdf4fac9cdc3512ce5bfe80d0f6cbb4f444ccfd6c WHIRLPOOL 1ee926de02ca13c420535487437a45ecf8ea652e854105f4849612a30091ff9f9098d422e7e1c49ab1a6a2cb36cb94d9587a7267851307d947c76109b863da7b

diff --git a/sci-electronics/kicad/files/kicad-boost-context.patch b/sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch
similarity index 100%
copy from sci-electronics/kicad/files/kicad-boost-context.patch
copy to sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch

diff --git a/sci-electronics/kicad/files/kicad-swig-import-helper.patch b/sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch
similarity index 100%
rename from sci-electronics/kicad/files/kicad-swig-import-helper.patch
rename to sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch

diff --git a/sci-electronics/kicad/files/kicad-boost-context.patch b/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch
similarity index 97%
rename from sci-electronics/kicad/files/kicad-boost-context.patch
rename to sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch
index 00e80f3..529a82c 100644
--- a/sci-electronics/kicad/files/kicad-boost-context.patch
+++ b/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch
@@ -1,19 +1,19 @@
-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 @@
+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 )
@@ -22,10 +22,10 @@ diff -Naur kicad-4.0.2-orig/CMakeLists.txt kicad-4.0.2/CMakeLists.txt
                                                     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 @@
+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
  
@@ -34,10 +34,10 @@ diff -Naur kicad-4.0.2-orig/common/CMakeLists.txt kicad-4.0.2/common/CMakeLists.
      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 @@
+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>
  
@@ -47,7 +47,7 @@ diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h kicad-4.0.2/include/tool/co
  
  #include "delegate.h"
  
-@@ -92,10 +91,8 @@
+@@ -92,10 +91,8 @@
          if( m_saved )
              delete m_saved;
  
@@ -58,7 +58,7 @@ diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h kicad-4.0.2/include/tool/co
  
          if( m_stack )
              free( m_stack );
-@@ -156,13 +153,9 @@
+@@ -156,13 +153,9 @@
          assert( m_saved == NULL );
  
          m_args = &aArgs;
@@ -75,7 +75,7 @@ diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h kicad-4.0.2/include/tool/co
  
          m_running = true;
          // off we go!
-@@ -222,14 +215,10 @@
+@@ -222,14 +215,10 @@
      }
  
      ///> Wrapper for jump_fcontext to assure compatibility between different boost versions
@@ -92,7 +92,7 @@ diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h kicad-4.0.2/include/tool/co
      }
  
      template <typename T>
-@@ -252,10 +241,10 @@
+@@ -252,10 +241,10 @@
      ReturnType m_retVal;
  
      ///< saved caller context

diff --git a/sci-electronics/kicad/kicad-4.0.1-r1.ebuild b/sci-electronics/kicad/kicad-4.0.1-r1.ebuild
index cbd6d23..985dae2 100644
--- a/sci-electronics/kicad/kicad-4.0.1-r1.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.1-r1.ebuild
@@ -42,7 +42,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
 	<dev-libs/boost-1.61[context,nls,threads,python?]
 	>=dev-libs/boost-1.56[context,nls,threads,python?]
 	github? ( dev-libs/openssl:0 )
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/freeglut
 	media-libs/mesa
 	sys-libs/zlib

diff --git a/sci-electronics/kicad/kicad-4.0.2-r1.ebuild b/sci-electronics/kicad/kicad-4.0.2-r1.ebuild
index cbd6d23..985dae2 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r1.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.2-r1.ebuild
@@ -42,7 +42,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
 	<dev-libs/boost-1.61[context,nls,threads,python?]
 	>=dev-libs/boost-1.56[context,nls,threads,python?]
 	github? ( dev-libs/openssl:0 )
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/freeglut
 	media-libs/mesa
 	sys-libs/zlib

diff --git a/sci-electronics/kicad/kicad-4.0.2-r2.ebuild b/sci-electronics/kicad/kicad-4.0.2-r2.ebuild
index b0670c6..a7c39c3 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r2.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.2-r2.ebuild
@@ -43,7 +43,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
 	)
 	>=dev-libs/boost-1.56[nls,threads,python?]
 	github? ( dev-libs/openssl:0 )
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/freeglut
 	media-libs/mesa
 	sys-libs/zlib
@@ -70,7 +70,7 @@ src_prepare() {
 	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"
+	epatch "${FILESDIR}/${P}-boost-context.patch"
 
 	# remove all the non unix file endings
 	find "${S}" -type f -name "*.desktop" | xargs -n1 dos2unix

diff --git a/sci-electronics/kicad/kicad-4.0.2-r3.ebuild b/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
index 998e630..ad2d2cd 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
@@ -43,7 +43,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
 	)
 	>=dev-libs/boost-1.56[nls,threads,python?]
 	github? ( dev-libs/openssl:0 )
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/freeglut
 	media-libs/mesa
 	sys-libs/zlib
@@ -70,9 +70,9 @@ src_prepare() {
 	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"
+	epatch "${FILESDIR}/${P}-boost-context.patch"
 	# Patch python swig import fixer build script
-	epatch "${FILESDIR}/${PN}-swig-import-helper.patch"
+	epatch "${FILESDIR}/${P}-swig-import-helper.patch"
 
 	# remove all the non unix file endings
 	find "${S}" -type f -name "*.desktop" | xargs -n1 dos2unix

diff --git a/sci-electronics/kicad/kicad-4.0.2-r4.ebuild b/sci-electronics/kicad/kicad-4.0.2-r4.ebuild
index 0aec71a..1765013 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r4.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.2-r4.ebuild
@@ -48,7 +48,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
 		libressl? ( dev-libs/libressl:0 )
 		!libressl? ( dev-libs/openssl:0 )
 	)
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/freeglut
 	media-libs/mesa
 	sys-libs/zlib
@@ -74,9 +74,9 @@ src_prepare() {
 	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"
+	epatch "${FILESDIR}/${P}-boost-context.patch"
 	# Patch python swig import fixer build script
-	epatch "${FILESDIR}/${PN}-swig-import-helper.patch"
+	epatch "${FILESDIR}/${P}-swig-import-helper.patch"
 
 	# remove all the non unix file endings
 	edos2unix $(find "${S}" -type f -name "*.desktop")

diff --git a/sci-electronics/kicad/kicad-4.0.2-r4.ebuild b/sci-electronics/kicad/kicad-4.0.4.ebuild
similarity index 80%
copy from sci-electronics/kicad/kicad-4.0.2-r4.ebuild
copy to sci-electronics/kicad/kicad-4.0.4.ebuild
index 0aec71a..21f5114 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r4.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.4.ebuild
@@ -18,7 +18,7 @@ SERIES=$(get_version_component_range 1-2)
 SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
 	!minimal? (
 		http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
-		https://github.com/KiCad/${PN}-library/archive/${PV}.tar.gz -> ${P}-library.tar.gz
+		http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.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"
@@ -26,7 +26,7 @@ SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
 LICENSE="GPL-2+ GPL-3+ Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples github i18n libressl minimal +python webkit"
+IUSE="debug doc examples github i18n libressl minimal +python"
 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}"
@@ -35,10 +35,9 @@ unset lang
 unset LANGS
 
 REQUIRED_USE="
-	github? ( webkit )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
-CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
+COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	python? (
 		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
@@ -48,16 +47,16 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
 		libressl? ( dev-libs/libressl:0 )
 		!libressl? ( dev-libs/openssl:0 )
 	)
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/freeglut
 	media-libs/mesa
 	sys-libs/zlib
 	x11-libs/cairo"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
 	i18n? ( virtual/libintl )
 	python? ( dev-lang/swig:0 )"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	sci-electronics/electronics-menu"
 
 pkg_setup() {
@@ -68,74 +67,72 @@ 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"
+	mkdir -p "${S}/common/system/" || die
+	mkdir -p "${S}/include/system/" || die
+	cp "${WORKDIR}/${PN}-libcontext/libcontext.cpp" "${S}/common/system/libcontext.cpp" || die
+	cp "${WORKDIR}/${PN}-libcontext/libcontext.h" "${S}/include/system/libcontext.h" || die
 	# 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"
-	# Patch python swig import fixer build script
-	epatch "${FILESDIR}/${PN}-swig-import-helper.patch"
+	epatch "${FILESDIR}/${P}-boost-context.patch"
 
 	# remove all the non unix file endings
 	edos2unix $(find "${S}" -type f -name "*.desktop")
 
 	# Remove cvpcb desktop file while it does nothing
-	rm "${WORKDIR}/${P}/resources/linux/mime/applications/cvpcb.desktop" || die "rm failed"
+	rm "${WORKDIR}/${P}/resources/linux/mime/applications/cvpcb.desktop" || die
 
 	# 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"
+		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die
 	else
 		# create a link to the parts library in the main project folder
-		ln -s "${WORKDIR}/${P}-library" "${S}/${PN}-library" || die "ln failed"
+		ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || die
 		# 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"
+		ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die
+		cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die
 		# 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"
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die
 		# 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"
+		sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( ${PN}-footprints )" -i CMakeLists.txt || die
 		# remove duplicate uninstall directions for the library module
-		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die "sed failed"
+		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die
 	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"
+		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die
 		# 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"
+				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die
 			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"
+		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die
 		# 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"
+		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die
 		# 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"
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die
 		# remove duplicate uninstall directions for the translation module
-		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
+		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die
 	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"
+		sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i CMakeLists.txt || die
 	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"
+		sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die
 	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"
+	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die
 }
 
 src_configure() {
@@ -154,7 +151,6 @@ src_configure() {
 		$(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
@@ -167,7 +163,7 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 	if use doc; then
-		doxygen Doxyfile || die "doxygen failed"
+		doxygen Doxyfile || die
 	fi
 }
 
@@ -176,7 +172,7 @@ src_install() {
 	use python && python_optimize
 	if use doc ; then
 		dodoc uncrustify.cfg
-		cd Documentation || die "cd failed"
+		cd Documentation || die
 		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
 	fi
 }


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2017-05-24 11:03 Michał Górny
  0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2017-05-24 11:03 UTC (permalink / raw
  To: gentoo-commits

commit:     58abb1e482842b9a215c7972810f9f2ed4fe04fc
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Tue May  2 07:31:14 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 24 11:02:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58abb1e4

sci-electronics/kicad: Bump to 4.0.6 version, #614268

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-electronics/kicad/Manifest                     |   4 +
 sci-electronics/kicad/files/kicad-boost-1.61.patch | 347 +++++++++++++++++++++
 sci-electronics/kicad/kicad-4.0.6.ebuild           | 191 ++++++++++++
 3 files changed, 542 insertions(+)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 59db11de40b..73b9bfaf08a 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -2,8 +2,12 @@ DIST kicad-4.0.4-i18n.tar.gz 2409039 SHA256 aec8121fc64985b150c0843db937a3383afe
 DIST kicad-4.0.4.tar.xz 10672424 SHA256 6da5d3f7bc63a9c5b4d0f5e4b954411b45d712168596b5af02957343c87eda00 SHA512 230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242 WHIRLPOOL c5e577bebfd11160528e9543d9a421a5814ad70134092e9a0bd759b7a941e730b33cac7059606eba049ad5ffc8e6d44a0079bdbe9446ad1f152fa04ec6150d4c
 DIST kicad-4.0.5-i18n.tar.gz 2464569 SHA256 18538b050f7c85eec0aaf3b2fd0a7a37a4eba139bb3d60be3ef80732e8e4b840 SHA512 ff33051202d3aa50284170ca1b0ebd6279ee60559c4ce88c577248d4fe3d5781bb5b75eea6c165fbbd4abc1fd681357a7d7877339c4413fb3774bc8a55264b81 WHIRLPOOL b63b9b59ddaf21485e8e358c356c694e03608989e6d2e13fc96bc620789cf1df66cf7d4fb051713ebcbd756afe6b43d217746ef2c84b593eeae8909c5e4c781f
 DIST kicad-4.0.5.tar.xz 10626696 SHA256 73f286733bb69b04749279a1848cbedfad908e7dcd1d11363c7fae7677c85331 SHA512 1486a039237e8d97ed21d62905ab74cb953b76c9d15bdfe7edd7380cf93e4c4b9a23aa82c6f523f6d5272e1dbe06ee8853a80eaabb1d0d9db6e304265f53ba7f WHIRLPOOL a7ca4e8183d44423a2076ca81047965166ed5f15504967ac790c18bedd045e61fbce17e197341876eb73aaa4a9a2571242cc5fcc4853abec99a19b3433690c6e
+DIST kicad-4.0.6-i18n.tar.gz 2578341 SHA256 eac9f2d2e4b149bd2bda007faefa1548e538c18be1700a7994829a1e5d0e86ac SHA512 d5a531857ed2699d9bbf583bd0716cef7b39d098e351a8e106d16b0001c592469c4f7a47f0c88e040479e5c515b9de3323b9419dfa17761c3f2cd059af2b0f8c WHIRLPOOL 177367132272d3a340d715c187b2bb3faddfd4c754c674d3a4482b39fe4e1f10cd0be67360c6a3a06f3b3d44865c6faa712b4fd721b1a1a52ef40a94741e5d33
+DIST kicad-4.0.6.tar.xz 10834136 SHA256 e97cacc179839e65f2afa14d8830a3bed549aaa9ed234c988851971bf2a42298 SHA512 f20e5bdb7f4535e8eb9d8d76926a89ad4b69fd727447269f45695556aed9f7ddfdc05f434021bc210490ccb4b5223658eafc275df8cfaae91e22e3b645f2837e WHIRLPOOL b5997b8e25a5624cc366a08e77ee982a8dda71269a2360743621d923b12855ea7d8bd93efece01f633e2999e8773f8fea10fc313a51b2e4b76abde11846dd405
 DIST kicad-footprints-4.0.4.tar.gz 1400434 SHA256 2b23e282c64c7e72d9ad52a6f114c20572b8c0e3fd9895b9b87b7ccacc7b4479 SHA512 7d42eea2c7c84961e05e0e61d6380e3d294d696e1321bb4406391125379fd6a3dc2b38e7ff8be51b684786bed892738452218f4c5a95c547319f1eaafc0cea6e WHIRLPOOL 6f96d7ecbe94c511f99c6022466704742aec83578790685c2945926682a0a2c50f2ff176bf075b06cea4cd60fe7afbfb8c142096b6b7a1d73020f0327d1281a8
 DIST kicad-footprints-4.0.5.tar.gz 2330378 SHA256 50cb02d9eb44b30f8fd68434172a25a93c62cd9a07877091116fd8db8238f9ad SHA512 91122127be4b54bec7b37706d6438853463ed66b1c0c205e8d93709c159744e84ea58f3bf0cb1f4e18df6061f6df3d76f2ff0d6e698c6ba5ce3867d89838d95d WHIRLPOOL 44283efb35c3522e73d36fc51d591bc236cf2f17b8901279d28908b5a227f791597c74c94bff3be904417df42248b5d16e93a9aaa061132809ffe0507911b186
+DIST kicad-footprints-4.0.6.tar.gz 5315435 SHA256 cb515000ff82ef369ab852a056d32b679f4fb7cd4f908d6d736516c01bc4af6e SHA512 808a5a16cabeb3c7ffcffbef9eb8b57b42953ea23e025c283ad8258a7fc07fecbfeaa4ffd6d33dc8fe00b63c45216a3a9fbd81568a2e99c07b6833df7f04e1a9 WHIRLPOOL 7679c05952bcf6e32e475e868c0ecda8b6b52626a30a8aa0e9a53755bbefb8816cb4de323274d3e9464c33ebbc2a056068eab81edd62c146c9bc52665ecddd55
 DIST kicad-libcontext.tar.gz 25599 SHA256 37be6072a6016d402b4341e2ceba719cdd8e279e275ea7275d91e19e813a31a3 SHA512 3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9 WHIRLPOOL d05f43544fa4c9d1fae957445782ad610c07564db81c12491fe6aeaf6948a369b3f55114eacb21916fbc9001f20d0a2c4944c3ab0ccc8e57bf9aa44fea507087
 DIST kicad-library-4.0.4.tar.gz 87947075 SHA256 22c02d151aba7ea90c519fda953a8cd882d8da7e36ec0e68ed90a6e15151cdf3 SHA512 57f905277cf581cfda6ca574d87bbdd3a870cd240a151b2c8faedc7ecbfa2cc122b67937cbdbf028be77727cdf4fac9cdc3512ce5bfe80d0f6cbb4f444ccfd6c WHIRLPOOL 1ee926de02ca13c420535487437a45ecf8ea652e854105f4849612a30091ff9f9098d422e7e1c49ab1a6a2cb36cb94d9587a7267851307d947c76109b863da7b
 DIST kicad-library-4.0.5.tar.gz 91081668 SHA256 7169d1cfa1a55cbe7570252e68dc1242ae91458f16a13f7fc3f7804c504b1af1 SHA512 904d3439d1e76d13fe72a221efe2f9f3b0a4115f8e84e78d44a24d5a727138de0b91eec7733e851b9a6fec138897f203229bdf83b772ea49000a6d828ba6f25f WHIRLPOOL f76975e99d69c3ca36532cd22b05edc7b278dd09d8d810fac5466a84687922b3b013242eca6b1a6ba48bb403fe05d2260bbc60136b718185774923013398e956
+DIST kicad-library-4.0.6.tar.gz 175137480 SHA256 eedc596583a56325f0f518342218a2af809db23d62dcdc7ad3ad0167da3dc499 SHA512 4c35ce045a59c289e54cf8f634b22e59c272d79f4db047a0049085793b70ce659aba7bdba182f03e7081e65d0921af380aa9ca84eff4d3ec8644822d161ba425 WHIRLPOOL 60c682ee721a098e9e0567b07cf748ae1e82cd0b82365ed5dbb3d84c12ab48e742eb8dc01fcec3dae661b805716d101beffe1c3ed2e5da0debf36f0eeb75968a

diff --git a/sci-electronics/kicad/files/kicad-boost-1.61.patch b/sci-electronics/kicad/files/kicad-boost-1.61.patch
new file mode 100644
index 00000000000..3ca8711b9f0
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-boost-1.61.patch
@@ -0,0 +1,347 @@
+--- a/common/tool/tool_manager.cpp
++++ b/common/tool/tool_manager.cpp
+@@ -532,11 +532,11 @@
+                     if( st->cofunc )
+                         st->Push();
+ 
++                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
++
+                     // as the state changes, the transition table has to be set up again
+                     st->transitions.clear();
+ 
+-                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
+-
+                     // got match? Run the handler.
+                     st->cofunc->Call( aEvent );
+ 
+--- a/include/tool/coroutine.h
++++ b/include/tool/coroutine.h
+@@ -27,10 +28,15 @@
+ 
+ #include <cstdlib>
+ 
+-#include <boost/context/fcontext.hpp>
+ #include <boost/version.hpp>
++#include <type_traits>
+ 
+-#include "delegate.h"
++#if BOOST_VERSION <= 106000
++#include <boost/context/fcontext.hpp>
++#else
++#include <boost/context/execution_context.hpp>
++#include <boost/context/protected_fixedsize_stack.hpp>
++#endif
+ 
+ /**
+  *  Class COROUNTINE.
+@@ -53,13 +59,12 @@
+  *  See coroutine_example.cpp for sample code.
+  */
+ 
+-template <class ReturnType, class ArgType>
++template <typename ReturnType, typename ArgType>
+ class COROUTINE
+ {
+ public:
+     COROUTINE() :
+-        m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ),
+-        m_running( false )
++        COROUTINE( nullptr )
+     {
+     }
+ 
+@@ -69,8 +74,7 @@
+      */
+     template <class T>
+     COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
+-        m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ),
+-        m_stackSize( c_defaultStackSize ), m_running( false )
++        COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
+     {
+     }
+ 
+@@ -78,9 +82,15 @@
+      * Constructor
+      * Creates a coroutine from a delegate object
+      */
+-    COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) :
+-        m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
+-        m_stackSize( c_defaultStackSize ), m_running( false )
++    COROUTINE( std::function<ReturnType(ArgType)> aEntry ) :
++        m_func( std::move( aEntry ) ),
++        m_running( false ),
++#if BOOST_VERSION <= 106000
++        m_stack( nullptr ),
++        m_stackSize( c_defaultStackSize ),
++#endif
++        m_caller( nullptr ),
++        m_callee( nullptr )
+     {
+         // Avoid not initialized members, and make static analysers quiet
+         m_args = 0;
+@@ -89,18 +99,26 @@
+ 
+     ~COROUTINE()
+     {
+-        if( m_saved )
+-            delete m_saved;
+-
+ #if BOOST_VERSION >= 105600
+-        if( m_self )
+-            delete m_self;
++        delete m_callee;
+ #endif
+ 
++#if BOOST_VERSION <= 106000
++        delete m_caller;
++
+         if( m_stack )
+             free( m_stack );
++#endif
+     }
+ 
++private:
++#if BOOST_VERSION <= 106000
++    using context_type = boost::context::fcontext_t;
++#else
++    using context_type = boost::context::execution_context<COROUTINE*>;
++#endif
++
++public:
+     /**
+      * Function Yield()
+      *
+@@ -110,7 +128,12 @@
+      */
+     void Yield()
+     {
+-        jump( m_self, m_saved, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_callee, m_caller, false );
++#else
++        auto result = (*m_caller)( this );
++        *m_caller = std::move( std::get<0>( result ) );
++#endif
+     }
+ 
+     /**
+@@ -122,7 +145,11 @@
+     void Yield( ReturnType& aRetVal )
+     {
+         m_retVal = aRetVal;
+-        jump( m_self, m_saved, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_callee, m_caller, false );
++#else
++        m_caller( this );
++#endif
+     }
+ 
+     /**
+@@ -130,9 +157,9 @@
+      *
+      * Defines the entry point for the coroutine, if not set in the constructor.
+      */
+-    void SetEntry( DELEGATE<ReturnType, ArgType> aEntry )
++    void SetEntry( std::function<ReturnType(ArgType)> aEntry )
+     {
+-        m_func = aEntry;
++        m_func = std::move( aEntry );
+     }
+ 
+     /* Function Call()
+@@ -143,6 +170,10 @@
+      */
+     bool Call( ArgType aArgs )
+     {
++        assert( m_callee == NULL );
++        assert( m_caller == NULL );
++
++#if BOOST_VERSION <= 106000
+         // fixme: Clean up stack stuff. Add a guard
+         m_stack = malloc( c_defaultStackSize );
+ 
+@@ -151,22 +182,32 @@
+ 
+         // correct the stack size
+         m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
+-
+-        assert( m_self == NULL );
+-        assert( m_saved == NULL );
++#endif
+ 
+         m_args = &aArgs;
+-#if BOOST_VERSION >= 105600
+-        m_self = new boost::context::fcontext_t();
+-        *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++
++#if BOOST_VERSION < 105600
++        m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++#elif BOOST_VERSION <= 106000
++        m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
+ #else
+-        m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++        m_callee = new context_type( std::allocator_arg_t(),
++                    boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
++#endif
++
++#if BOOST_VERSION <= 106000
++        m_caller = new context_type();
+ #endif
+-        m_saved = new boost::context::fcontext_t();
+ 
+         m_running = true;
++
+         // off we go!
+-        jump( m_saved, m_self, reinterpret_cast<intptr_t>( this ) );
++#if BOOST_VERSION <= 106000
++        jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) );
++#else
++        auto result = (*m_callee)( this );
++        *m_callee = std::move( std::get<0>( result ) );
++#endif
+         return m_running;
+     }
+ 
+@@ -179,7 +220,12 @@
+      */
+     bool Resume()
+     {
+-        jump( m_saved, m_self, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_caller, m_callee, false );
++#else
++        auto result = (*m_callee)( this );
++        *m_callee = std::move( std::get<0>( result ) );
++#endif
+ 
+         return m_running;
+     }
+@@ -208,61 +254,66 @@
+     static const int c_defaultStackSize = 2000000;    // fixme: make configurable
+ 
+     /* real entry point of the coroutine */
++#if BOOST_VERSION <= 106000
+     static void callerStub( intptr_t aData )
++#else
++    static context_type callerStub( context_type caller, COROUTINE* cor )
++#endif
+     {
+         // get pointer to self
++#if BOOST_VERSION <= 106000
+         COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData );
++#else
++        cor->m_caller = &caller;
++#endif
+ 
+         // call the coroutine method
+-        cor->m_retVal = cor->m_func( *cor->m_args );
++        cor->m_retVal = cor->m_func( *( cor->m_args ) );
+         cor->m_running = false;
+ 
+         // go back to wherever we came from.
+-        jump( cor->m_self, cor->m_saved, 0 );    // reinterpret_cast<intptr_t>( this ));
++#if BOOST_VERSION <= 106000
++        jump( cor->m_callee, cor->m_caller, 0 );
++#else
++        return caller;
++#endif
+     }
+ 
+     ///> 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,
++#if BOOST_VERSION <= 106000
++    static inline intptr_t jump( context_type* aOld, context_type* aNew,
+                                 intptr_t aP, bool aPreserveFPU = true )
+     {
+-#if BOOST_VERSION >= 105600
+-        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
+-#else
++#if BOOST_VERSION < 105600
+         return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
++#else
++        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
+ #endif
+     }
++#endif
+ 
+-    template <typename T>
+-    struct strip_ref
+-    {
+-        typedef T result;
+-    };
++    std::function<ReturnType(ArgType)> m_func;
+ 
+-    template <typename T>
+-    struct strip_ref<T&>
+-    {
+-        typedef T result;
+-    };
++    bool m_running;
+ 
+-    DELEGATE<ReturnType, ArgType> m_func;
++#if BOOST_VERSION <= 106000
++    ///< coroutine stack
++    void* m_stack;
++
++    size_t m_stackSize;
++#endif
+ 
+     ///< pointer to coroutine entry arguments. Stripped of references
+     ///< to avoid compiler errors.
+-    typename strip_ref<ArgType>::result* m_args;
++    typename std::remove_reference<ArgType>::type* m_args;
++
+     ReturnType m_retVal;
+ 
+     ///< saved caller context
+-    boost::context::fcontext_t* m_saved;
++    context_type* m_caller;
+ 
+     ///< saved coroutine context
+-    boost::context::fcontext_t* m_self;
+-
+-    ///< coroutine stack
+-    void* m_stack;
+-
+-    size_t m_stackSize;
+-
+-    bool m_running;
++    context_type* m_callee;
+ };
+ 
+ #endif
+--- a/include/tool/tool_base.h
++++ b/include/tool/tool_base.h
+@@ -31,7 +32,7 @@
+ #include <tool/tool_event.h>
+ #include <tool/tool_settings.h>
+ 
+-#include <tool/delegate.h>
++#include <functional>
+ 
+ class EDA_ITEM;
+ class TOOL_MANAGER;
+@@ -53,7 +54,9 @@
+ 
+ /// Unique identifier for tools
+ typedef int TOOL_ID;
+-typedef DELEGATE<int, const TOOL_EVENT&> TOOL_STATE_FUNC;
++
++using TOOL_STATE_FUNC = std::function<int(const TOOL_EVENT&)>;
++
+ 
+ /**
+  * Class TOOL_BASE
+--- a/include/tool/tool_interactive.h
++++ b/include/tool/tool_interactive.h
+@@ -113,7 +114,7 @@
+ void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ),
+                            const TOOL_EVENT_LIST& aConditions )
+ {
+-    TOOL_STATE_FUNC sptr( static_cast<T*>( this ), aStateFunc );
++    TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast<T*>( this ), std::placeholders::_1 );
+ 
+     goInternal( sptr, aConditions );
+ }
+

diff --git a/sci-electronics/kicad/kicad-4.0.6.ebuild b/sci-electronics/kicad/kicad-4.0.6.ebuild
new file mode 100644
index 00000000000..3e7cb453e50
--- /dev/null
+++ b/sci-electronics/kicad/kicad-4.0.6.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils eutils flag-o-matic gnome2-utils python-single-r1 wxwidgets vcs-snapshot versionator xdg
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+
+SERIES=$(get_version_component_range 1-2)
+
+SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
+	!minimal? (
+		http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
+		http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.tar.gz
+	)
+	i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples github i18n libressl minimal +python"
+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} l10n_${lang}"
+done
+unset lang
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
+	python? (
+		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	>=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}]
+	github? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	media-libs/glew:0=
+	media-libs/freeglut
+	media-libs/mesa
+	sys-libs/zlib
+	x11-libs/cairo"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	i18n? ( virtual/libintl )
+	python? ( dev-lang/swig:0 )"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Patch to work with >=boost 1.61
+	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
+
+	# remove all the non unix file endings
+	while IFS="" read -d $'\0' -r f; do
+		edos2unix "${f}"
+	done < <(find "${S}" -type f -name "*.desktop" -print0)
+
+	# Remove cvpcb desktop file while it does nothing
+	rm "${WORKDIR}/${P}/resources/linux/mime/applications/cvpcb.desktop" || die
+
+	# 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
+	else
+		# create a link to the parts library in the main project folder
+		ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || die
+		# create a link to the footprints library and add cmake build rule for it
+		ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die
+		cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die
+		# 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
+		# 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
+		# remove duplicate uninstall directions for the library module
+		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die
+	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
+		# 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 l10n_* settings.
+		local lang
+		for lang in ${LANGS}; do
+			if ! use l10n_${lang}; then
+				lang="${lang//-/_}"  # Needed to turn zh-CN to zh_CN as KiCad does not follow l10n standard here
+				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die
+			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
+		# 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
+		# 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
+		# remove duplicate uninstall directions for the translation module
+		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die
+	fi
+
+	# Install examples if requested
+	use examples || sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die
+
+	# Add important missing doc files
+	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die
+}
+
+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"
+		-DwxUSE_UNICODE=ON
+		-DKICAD_SKIP_BOOST=ON
+		-DBUILD_GITHUB_PLUGIN="$(usex github)"
+		-DKICAD_SCRIPTING="$(usex python)"
+		-DKICAD_SCRIPTING_MODULES="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
+		-DCMAKE_CXX_FLAGS="-std=c++11"
+	)
+	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
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2018-05-16  9:03 Andreas Sturmlechner
  0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-05-16  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d00cfe6700229442c37df3376a5b9220bc156a63
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Mon Apr 16 00:55:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 16 09:03:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d00cfe67

sci-electronics/kicad: Fix configuration issue with >=CMake-3.11

KiCad had a legacy redefinition of the CHECK_CXX_SYMBOL_EXISTS macro,
that is not needed since CMake-2.8.6. Upstream fix:
https://github.com/KiCad/kicad-source-mirror/commit/2e0b75c058d676f427328506bbf3bc10079da117
Also fixed src_configure().

Partial merge of https://github.com/gentoo/gentoo/pull/8020

Closes: https://bugs.gentoo.org/652204
Closes: https://bugs.gentoo.org/652736

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../files/kicad-cmake-checkcxxsymbolexists.patch   | 46 ++++++++++++++++++++++
 sci-electronics/kicad/kicad-4.0.5-r1.ebuild        |  8 ++--
 sci-electronics/kicad/kicad-4.0.6.ebuild           |  8 ++--
 sci-electronics/kicad/kicad-4.0.7.ebuild           |  5 ++-
 4 files changed, 59 insertions(+), 8 deletions(-)

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 00000000000..b2a1eeb2cc4
--- /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 da56b49911b..2e59e1a1d63 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 da56b49911b..2e59e1a1d63 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 5f15284ffd5..d7108063bd5 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)"


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2020-05-14 10:36 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2020-05-14 10:36 UTC (permalink / raw
  To: gentoo-commits

commit:     41cbc5c9a11f007e126063bc7b60e57b8ca24538
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Tue May 12 08:10:34 2020 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu May 14 10:34:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41cbc5c9

sci-electronics/kicad: Drop 5.0.1

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

 sci-electronics/kicad/Manifest                     |   1 -
 sci-electronics/kicad/files/kicad-5.0.0-curl.patch |  23 ----
 sci-electronics/kicad/files/kicad-5.0.0-help.patch | 117 -------------------
 sci-electronics/kicad/kicad-5.0.1.ebuild           | 130 ---------------------
 4 files changed, 271 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index be715a6e32b..5b38dbd3a14 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,6 +1,5 @@
 DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
 DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-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

diff --git a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch b/sci-electronics/kicad/files/kicad-5.0.0-curl.patch
deleted file mode 100644
index c99071c0a54..00000000000
--- a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/common/CMakeLists.txt.old    2018-09-13 16:21:29.642915273 +0200
-+++ a/common/CMakeLists.txt    2018-09-13 16:23:25.146914833 +0200
-@@ -337,14 +337,17 @@
-     list( APPEND COMMON_SRCS strtok_r.c )
- endif()
- 
-+if( BUILD_GITHUB_PLUGIN )
-+    list( APPEND COMMON_SRCS
-+        kicad_curl/kicad_curl.cpp
-+        kicad_curl/kicad_curl_easy.cpp
-+    )
-+endif()
- 
- set( COMMON_SRCS
-     ${COMMON_SRCS}
-     system/libcontext.cpp
- 
--    kicad_curl/kicad_curl.cpp
--    kicad_curl/kicad_curl_easy.cpp
--
-     view/view.cpp
-     view/view_item.cpp
-     view/view_group.cpp

diff --git a/sci-electronics/kicad/files/kicad-5.0.0-help.patch b/sci-electronics/kicad/files/kicad-5.0.0-help.patch
deleted file mode 100644
index 0fb43c3550c..00000000000
--- a/sci-electronics/kicad/files/kicad-5.0.0-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur kicad-5.0.1-orig/CMakeLists.txt kicad-5.0.1/CMakeLists.txt
---- kicad-5.0.1-orig/CMakeLists.txt	2018-10-08 14:14:38.000000000 -0700
-+++ kicad-5.0.1/CMakeLists.txt	2018-12-25 00:04:50.423849671 -0800
-@@ -418,6 +418,10 @@
- set( KIFACE_PREFIX  "_" )
- #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  KIFACE_PREFIX:${KIFACE_PREFIX}" )
- 
-+# KICAD_HELP is the location of the help files accessed from the UI
-+# (usually provided via kicad-doc package)
-+set ( KICAD_HELP share/doc/kicad
-+    CACHE PATH "Alternative location of KiCad help files.")
- 
- #================================================
- # Locations for install targets.
-diff -Naur kicad-5.0.1-orig/CMakeModules/config.h.cmake kicad-5.0.1/CMakeModules/config.h.cmake
---- kicad-5.0.1-orig/CMakeModules/config.h.cmake	2018-10-08 14:14:38.000000000 -0700
-+++ kicad-5.0.1/CMakeModules/config.h.cmake	2018-12-25 00:04:39.215828924 -0800
-@@ -59,6 +59,10 @@
- /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX.
- #define DEFAULT_INSTALL_PATH            "@DEFAULT_INSTALL_PATH@"
- 
-+/// KiCad help files path can be different on some systems allow adding alternative,
-+/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad
-+#define KICAD_HELP                       "@KICAD_HELP@"
-+
- /// The wxPython version found during configuration.
- #if defined( KICAD_SCRIPTING_WXPYTHON )
- #define WXPYTHON_VERSION                "@WXPYTHON_VERSION@"
-diff -Naur kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp kicad-5.0.1/common/searchhelpfilefullpath.cpp
---- kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp	2018-10-08 14:14:38.000000000 -0700
-+++ kicad-5.0.1/common/searchhelpfilefullpath.cpp	2018-12-25 00:04:05.576771741 -0800
-@@ -25,7 +25,7 @@
- 
- #include <pgm_base.h>
- #include <common.h>
--#include <config.h>     // to define DEFAULT_INSTALL_PATH
-+#include <config.h>     // to define DEFAULT_INSTALL_PATH and KICAD_HELP
- #include <macros.h>
- 
- 
-@@ -68,6 +68,10 @@
-     wxArrayString   subdirs;
-     wxArrayString   altsubdirs;
-     SEARCH_STACK    ss = aSStack;
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+    SEARCH_STACK    altss;
-+    wxArrayString   moresubdirs;
-+#endif
- 
-     // It might already be in aSStack, but why depend on other code
-     // far away when it's so easy to add it again (to our copy) as the first place to look.
-@@ -75,6 +79,7 @@
-     // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during
-     // build configuration:
-     ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
-+    altss.AddPaths( wxT( KICAD_HELP ), 0 );
- 
- #if defined(__WXMAC__)
-     ss.AddPaths( GetOSXKicadMachineDataDir() );
-@@ -103,16 +108,17 @@
- 
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     subdirs.Add( wxT( "share" ) );
-     subdirs.Add( wxT( "doc" ) );
-     subdirs.Add( wxT( "kicad" ) );
-     subdirs.Add( wxT( "help" ) );
- 
-+    // For custom help path installations via ${KICAD_HELP}
-+    moresubdirs.Add( wxT( "help" ) );
-+
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     altsubdirs.Add( wxT( "doc" ) );
-     altsubdirs.Add( wxT( "help" ) );
-@@ -158,6 +164,9 @@
-     {
-         subdirs.Add( locale_name_dirs[ii] );
-         altsubdirs.Add( locale_name_dirs[ii] );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.Add( locale_name_dirs[ii] );
-+#endif
- 
-         fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs );
- 
-@@ -187,8 +196,27 @@
-         if( !fn.IsEmpty() )
-             break;
- 
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+        {
-+            // Prepend URI protocol since we will open in a browser
-+            fn = wxT( "file://" ) + fn;
-+            break;
-+        }
-+
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+            break;
-+#endif
-+
-         subdirs.RemoveAt( subdirs.GetCount() - 1 );
-         altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#endif
-     }
- 
-     return fn;

diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
deleted file mode 100644
index cb1d50631ac..00000000000
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-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}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.xz"
-
-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=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep "
-		python? (
-			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_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.0.0-curl.patch"
-	"${FILESDIR}"/"${PN}-5.0.0-help.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="/usr/share/doc/${P}"
-		-DKICAD_HELP="/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_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
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2020-06-06 17:47 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2020-06-06 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     1d73c3b32fe52dd04d263b9701ce227c1b927891
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Tue May 26 04:24:17 2020 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 17:46:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d73c3b3

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 <AT> sinustrom.info>
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

 sci-electronics/kicad/Manifest                     |   1 +
 .../kicad/files/kicad-5.1.6-metainfo.patch         |  30 ++++
 .../kicad/files/kicad-5.1.6-ninja-build.patch      |  45 ++++++
 sci-electronics/kicad/kicad-5.1.6.ebuild           | 152 +++++++++++++++++++++
 4 files changed, 228 insertions(+)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 5b38dbd3a14..ecfc7f31056 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 00000000000..675ff749de8
--- /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 00000000000..baff144fbd8
--- /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 00000000000..2542a2bc1f2
--- /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
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2020-06-06 17:47 Alexey Shvetsov
  0 siblings, 0 replies; 10+ messages in thread
From: Alexey Shvetsov @ 2020-06-06 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     0079fc0e567fd919f6c8b2cc9a373a56ae8c8dc5
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Tue May 26 05:39:33 2020 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Jun  6 17:46:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0079fc0e

sci-electronics/kicad: Drop 5.1.0, 5.1.2, 5.1.4

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

 sci-electronics/kicad/Manifest                     |   3 -
 sci-electronics/kicad/files/kicad-5.1.0-help.patch | 117 ------------------
 .../kicad/files/kicad-5.1.0-swig-4.0.0.patch       |  12 --
 sci-electronics/kicad/kicad-5.1.0-r1.ebuild        | 131 --------------------
 sci-electronics/kicad/kicad-5.1.2-r1.ebuild        | 133 ---------------------
 sci-electronics/kicad/kicad-5.1.4.ebuild           | 132 --------------------
 6 files changed, 528 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index ecfc7f31056..be5b223eb6f 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,8 +1,5 @@
 DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
 DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-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-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

diff --git a/sci-electronics/kicad/files/kicad-5.1.0-help.patch b/sci-electronics/kicad/files/kicad-5.1.0-help.patch
deleted file mode 100644
index e89b7e45c24..00000000000
--- a/sci-electronics/kicad/files/kicad-5.1.0-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur /tmp/kicad-5.1.0-orig/CMakeLists.txt kicad-5.1.0/CMakeLists.txt
---- /tmp/kicad-5.1.0-orig/CMakeLists.txt	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/CMakeLists.txt	2019-03-24 16:16:58.287376258 -0700
-@@ -427,6 +427,10 @@
- set( KIFACE_PREFIX  "_" )
- #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  KIFACE_PREFIX:${KIFACE_PREFIX}" )
- 
-+# KICAD_HELP is the location of the help files accessed from the UI
-+# (usually provided via kicad-doc package)
-+set ( KICAD_HELP share/doc/kicad
-+    CACHE PATH "Alternative location of KiCad help files.")
- 
- #================================================
- # Locations for install targets.
-diff -Naur /tmp/kicad-5.1.0-orig/CMakeModules/config.h.cmake kicad-5.1.0/CMakeModules/config.h.cmake
---- /tmp/kicad-5.1.0-orig/CMakeModules/config.h.cmake	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/CMakeModules/config.h.cmake	2019-03-24 16:16:58.287376258 -0700
-@@ -59,6 +59,10 @@
- /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX.
- #define DEFAULT_INSTALL_PATH            "@DEFAULT_INSTALL_PATH@"
- 
-+/// KiCad help files path can be different on some systems allow adding alternative,
-+/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad
-+#define KICAD_HELP                       "@KICAD_HELP@"
-+
- /// The wxPython version found during configuration.
- #if defined( KICAD_SCRIPTING_WXPYTHON )
- #define WXPYTHON_VERSION                "@WXPYTHON_VERSION@"
-diff -Naur /tmp/kicad-5.1.0-orig/common/searchhelpfilefullpath.cpp kicad-5.1.0/common/searchhelpfilefullpath.cpp
---- /tmp/kicad-5.1.0-orig/common/searchhelpfilefullpath.cpp	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/common/searchhelpfilefullpath.cpp	2019-03-24 16:17:31.527588523 -0700
-@@ -25,7 +25,7 @@
- 
- #include <pgm_base.h>
- #include <common.h>
--#include <config.h>     // to define DEFAULT_INSTALL_PATH
-+#include <config.h>     // to define DEFAULT_INSTALL_PATH and KICAD_HELP
- #include <macros.h>
- #include <trace_helpers.h>
- 
-@@ -69,6 +69,10 @@
-     wxArrayString   subdirs;
-     wxArrayString   altsubdirs;
-     SEARCH_STACK    ss = aSStack;
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+    SEARCH_STACK    altss;
-+    wxArrayString   moresubdirs;
-+#endif
- 
-     // It might already be in aSStack, but why depend on other code
-     // far away when it's so easy to add it again (to our copy) as the first place to look.
-@@ -76,6 +80,7 @@
-     // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during
-     // build configuration:
-     ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
-+    altss.AddPaths( wxT( KICAD_HELP ), 0 );
- 
- #if defined(__WXMAC__)
-     ss.AddPaths( GetOSXKicadMachineDataDir() );
-@@ -104,16 +109,17 @@
- 
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     subdirs.Add( "share" );
-     subdirs.Add( "doc" );
-     subdirs.Add( "kicad" );
-     subdirs.Add( "help" );
- 
-+    // For custom help path installations via ${KICAD_HELP}
-+    moresubdirs.Add( "help" );
-+
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     altsubdirs.Add( "doc" );
-     altsubdirs.Add( "help" );
-@@ -159,6 +165,9 @@
-     {
-         subdirs.Add( locale_name_dirs[ii] );
-         altsubdirs.Add( locale_name_dirs[ii] );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.Add( locale_name_dirs[ii] );
-+#endif
- 
-         fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs );
- 
-@@ -188,8 +197,27 @@
-         if( !fn.IsEmpty() )
-             break;
- 
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+        {
-+            // Prepend URI protocol since we will open in a browser
-+            fn = wxT( "file://" ) + fn;
-+            break;
-+        }
-+
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+            break;
-+#endif
-+
-         subdirs.RemoveAt( subdirs.GetCount() - 1 );
-         altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#endif
-     }
- 
-     return fn;

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
deleted file mode 100644
index 3ab6677e5e1..00000000000
--- a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
deleted file mode 100644
index 558341e09d2..00000000000
--- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 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=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-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 ~arm64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
-"
-
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep "
-		python? (
-			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
-	")
-	github? ( net-misc/curl:=[ssl] )
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/freeglut
-	media-libs/mesa[X(+)]
-	ngspice? (
-		>sci-electronics/ngspice-27[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_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-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
deleted file mode 100644
index 0afea316688..00000000000
--- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 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_{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_gen_cond_dep "
-		python? (
-			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
-	")
-	github? ( net-misc/curl:=[ssl] )
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/freeglut
-	media-libs/mesa[X(+)]
-	ngspice? (
-		>sci-electronics/ngspice-27[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.4.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
deleted file mode 100644
index 88c18773559..00000000000
--- a/sci-electronics/kicad/kicad-5.1.4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 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_{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_gen_cond_dep "
-		python? (
-			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
-	")
-	github? ( net-misc/curl:=[ssl] )
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/freeglut
-	media-libs/mesa[X(+)]
-	ngspice? (
-		>sci-electronics/ngspice-27[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"
-)
-
-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
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2021-01-18 10:14 David Seifert
  0 siblings, 0 replies; 10+ messages in thread
From: David Seifert @ 2021-01-18 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     182524b3a568fe60c1b0e9a6e534fc4fa895c227
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Jan 18 10:14:24 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 10:14:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182524b3

sci-electronics/kicad: Remove old

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-electronics/kicad/Manifest                     |   3 -
 .../kicad/files/kicad-5.1.5-algorithm-header.patch |  11 --
 .../kicad/files/kicad-5.1.6-ninja-build.patch      |  45 ------
 sci-electronics/kicad/kicad-5.1.6.ebuild           | 159 ---------------------
 sci-electronics/kicad/kicad-5.1.7.ebuild           | 158 --------------------
 sci-electronics/kicad/kicad-5.1.8.ebuild           | 158 --------------------
 6 files changed, 534 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index aa0af793ab9..a3d6d27bf93 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,4 +1 @@
-DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f SHA512 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
-DIST kicad-5.1.7.tar.bz2 18279204 BLAKE2B 9d12cf06282d2b8a5c5c4b0a387774ef90f8035bf0fafd9f5d939819f71edbb248d2b15fb4b3f35a80950fd41d140d93165ece61748076d7e2938cc0c9140e46 SHA512 f853eed50245d875b2443cc9accb3c75e8404d8fee12f129df68b3ab7052c31cda1eb0ad22fc10eb23b35250188973fb51a8c55fcb1560ea65d6e5e22b94a182
-DIST kicad-5.1.8.tar.bz2 18282857 BLAKE2B 07afa95853dae587293f71b4b6b5e888610439d39dd5bd715a1f424a837d46894771bf3eb4b447f7a70ea0bb0a810fee141a81bf56a4be50e81415b38552ff11 SHA512 6d40c5ce65c4350174412359d03a9c0c3a311de9ba57d92c1b053fefbb3e518cccb7a38a2a87e8f5b1950a3676514d25ae0e5e14a97b72a56cc0d401aeab3452
 DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108 SHA512 565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739

diff --git a/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
deleted file mode 100644
index aa118ea6f86..00000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur kicad-5.1.5-orig/common/lib_tree_model.cpp kicad-5.1.5/common/lib_tree_model.cpp
---- kicad-5.1.5-orig/common/lib_tree_model.cpp  2020-05-11 00:36:36.568301297 +0200
-+++ kicad-5.1.5/common/lib_tree_model.cpp       2020-05-11 00:37:50.472359703 +0200
-@@ -21,6 +21,7 @@
-
- #include <lib_tree_model.h>
-
-+#include <algorithm>
- #include <eda_pattern_match.h>
- #include <lib_tree_item.h>
- #include <make_unique.h>

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
deleted file mode 100644
index baff144fbd8..00000000000
--- a/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index 0eff75e7cb8..00000000000
--- a/sci-electronics/kicad/kicad-5.1.6.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature 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
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
-
-	default
-}
-
-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
-}

diff --git a/sci-electronics/kicad/kicad-5.1.7.ebuild b/sci-electronics/kicad/kicad-5.1.7.ebuild
deleted file mode 100644
index 4e39f2bdd57..00000000000
--- a/sci-electronics/kicad/kicad-5.1.7.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature 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}/${PN}-5.1.6-ninja-build.patch"
-	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
-	"${FILESDIR}/${PN}-5.1.6-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
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
-
-	default
-}
-
-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
-}

diff --git a/sci-electronics/kicad/kicad-5.1.8.ebuild b/sci-electronics/kicad/kicad-5.1.8.ebuild
deleted file mode 100644
index eb9b3fb0198..00000000000
--- a/sci-electronics/kicad/kicad-5.1.8.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad.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}/${PN}-5.1.6-ninja-build.patch"
-	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
-	"${FILESDIR}/${PN}-5.1.6-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
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
-
-	default
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
@ 2023-02-21 17:56 Matthew Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Matthew Smith @ 2023-02-21 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     996b5c04c7f5fb478244ff8372db0af3eaa130bd
Author:     Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 18:33:52 2023 +0000
Commit:     Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 17:56:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996b5c04

sci-electronics/kicad: remove -Werror

Closes: https://bugs.gentoo.org/895014
Acked-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>

 .../kicad/files/kicad-7.0.0-werror.patch            | 21 +++++++++++++++++++++
 sci-electronics/kicad/kicad-7.0.0-r1.ebuild         |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/sci-electronics/kicad/files/kicad-7.0.0-werror.patch b/sci-electronics/kicad/files/kicad-7.0.0-werror.patch
new file mode 100644
index 000000000000..b5fa3b1ae15d
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-7.0.0-werror.patch
@@ -0,0 +1,21 @@
+From 04fc6081bd3d6575d00589f71150ab796778a9c9 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Mon, 20 Feb 2023 17:53:50 +0000
+Subject: [PATCH] build: Remove Werror flag from clipper2
+
+Bug: https://bugs.gentoo.org/895014
+
+--- a/thirdparty/clipper2/CMakeLists.txt
++++ b/thirdparty/clipper2/CMakeLists.txt
+@@ -27,7 +27,7 @@ target_compile_definitions(clipper2 PUBLIC USINGZ)
+ if (MSVC)
+   target_compile_options(clipper2 PRIVATE /W4 /WX)
+ else()
+-  target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
++  target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic)
+   target_link_libraries(clipper2 PUBLIC -lm)
+ endif()
+ 
+-- 
+2.39.2
+

diff --git a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
index 6e1f702ce060..a6db98a4f37a 100644
--- a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
@@ -77,6 +77,8 @@ CHECKREQS_DISK_BUILD="900M"
 PATCHES=(
 	# https://bugs.gentoo.org/895188
 	"${FILESDIR}"/${PN}-7.0.0-wxwidgets-version.patch
+
+	"${FILESDIR}"/${PN}-7.0.0-werror.patch
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2023-02-21 17:56 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-14 10:36 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/ Alexey Shvetsov
  -- strict thread matches above, loose matches on Subject: below --
2023-02-21 17:56 Matthew Smith
2021-01-18 10:14 David Seifert
2020-06-06 17:47 Alexey Shvetsov
2020-06-06 17:47 Alexey Shvetsov
2018-05-16  9:03 Andreas Sturmlechner
2017-05-24 11:03 Michał Górny
2016-09-20 22:34 Mike Gilbert
2016-06-29 17:56 Michał Górny
2016-06-18  7:42 Jason Zaman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox