From 8b9a5153b00803bc29cd6809f3d7725d0589f3c0 Mon Sep 17 00:00:00 2001 From: Zoltan Puskas Date: Sun, 28 Jul 2019 23:58:00 -0700 Subject: sci-electronics/kicad: Fix 5.1.x build issues with swig-4.0.0 Closes: https://bugs.gentoo.org/690146 Signed-off-by: Zoltan Puskas Package-Manager: Portage-2.3.69, Repoman-2.3.16 Closes: https://github.com/gentoo/gentoo/pull/12568 Signed-off-by: Alexey Shvetsov --- .../kicad/files/kicad-5.1.0-swig-4.0.0.patch | 12 ++ sci-electronics/kicad/kicad-5.1.0-r1.ebuild | 129 ++++++++++++++++++++ sci-electronics/kicad/kicad-5.1.0.ebuild | 128 -------------------- sci-electronics/kicad/kicad-5.1.2-r1.ebuild | 131 +++++++++++++++++++++ sci-electronics/kicad/kicad-5.1.2.ebuild | 130 -------------------- 5 files changed, 272 insertions(+), 258 deletions(-) create mode 100644 sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch create mode 100644 sci-electronics/kicad/kicad-5.1.0-r1.ebuild delete mode 100644 sci-electronics/kicad/kicad-5.1.0.ebuild create mode 100644 sci-electronics/kicad/kicad-5.1.2-r1.ebuild delete mode 100644 sci-electronics/kicad/kicad-5.1.2.ebuild (limited to 'sci-electronics') diff --git a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch new file mode 100644 index 000000000000..3ab6677e5e18 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch @@ -0,0 +1,12 @@ +--- a/scripting/build_tools/fix_swig_imports.py 2019-04-22 23:14:54.000000000 +0200 ++++ b/scripting/build_tools/fix_swig_imports.py 2019-07-18 15:44:24.255754237 +0200 +@@ -40,6 +40,9 @@ + txt = b"" + + for l in lines: ++ if l.startswith(b"if _swig_python_version_info < (2, 7, 0):"): # ok with swig version >= 4.0.0 ++ l = l.replace(b"_swig_python_version_info < (2, 7, 0)", b"False") ++ doneOk = True + if l.startswith(b"if _swig_python_version_info >= (2, 7, 0):"): # ok with swig version >= 3.0.10 + l = l.replace(b"_swig_python_version_info >= (2, 7, 0)", b"False") + doneOk = True diff --git a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild new file mode 100644 index 000000000000..c7eca78142e4 --- /dev/null +++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Can switch to EAPI=7 when wxwidgets eclass also supports it +EAPI=6 +PYTHON_COMPAT=( 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? ( + dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + >=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}] + github? ( net-misc/curl:=[ssl] ) + media-libs/glew:0= + media-libs/glm + media-libs/freeglut + media-libs/mesa + ngspice? ( + sci-electronics/ngspice[shared] + ) + occ? ( >=sci-libs/opencascade-6.8.0:= ) + oce? ( sci-libs/oce ) + >=x11-libs/cairo-1.8.8:= + >=x11-libs/pixman-0.30" +DEPEND="${COMMON_DEPEND} + doc? ( app-doc/doxygen ) + python? ( >=dev-lang/swig-3.0:0 )" +RDEPEND="${COMMON_DEPEND} + sci-electronics/electronics-menu +" +CHECKREQS_DISK_BUILD="800M" + +PATCHES=( + "${FILESDIR}"/"${PN}-5.1.0-help.patch" + "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use openmp && tc-check-openmp + setup-wxwidgets + check-reqs_pkg_setup +} + +src_configure() { + xdg_environment_reset + + local mycmakeargs=( + -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}" + -DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" + -DBUILD_GITHUB_PLUGIN="$(usex github)" + -DKICAD_SCRIPTING="$(usex python)" + -DKICAD_SCRIPTING_MODULES="$(usex python)" + -DKICAD_SCRIPTING_WXPYTHON="$(usex python)" + -DKICAD_SCRIPTING_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.0.ebuild b/sci-electronics/kicad/kicad-5.1.0.ebuild deleted file mode 100644 index 8fca5ececb98..000000000000 --- a/sci-electronics/kicad/kicad-5.1.0.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Can switch to EAPI=7 when wxwidgets eclass also supports it -EAPI=6 -PYTHON_COMPAT=( 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? ( - dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}] - github? ( net-misc/curl:=[ssl] ) - media-libs/glew:0= - media-libs/glm - media-libs/freeglut - media-libs/mesa - ngspice? ( - sci-electronics/ngspice[shared] - ) - occ? ( >=sci-libs/opencascade-6.8.0:= ) - oce? ( sci-libs/oce ) - >=x11-libs/cairo-1.8.8:= - >=x11-libs/pixman-0.30" -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) - python? ( >=dev-lang/swig-3.0:0 )" -RDEPEND="${COMMON_DEPEND} - sci-electronics/electronics-menu -" -CHECKREQS_DISK_BUILD="800M" - -PATCHES=( - "${FILESDIR}"/"${PN}-5.1.0-help.patch" -) - -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 new file mode 100644 index 000000000000..0505a9fa4368 --- /dev/null +++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Can switch to EAPI=7 when wxwidgets eclass also supports it +EAPI=6 +PYTHON_COMPAT=( python3_{5,6,7} ) + +WX_GTK_VER="3.0-gtk3" + +inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils + +DESCRIPTION="Electronic Schematic and PCB design tools" +HOMEPAGE="http://www.kicad-pcb.org" +SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz" + +LICENSE="GPL-2+ GPL-3+ Boost-1.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples github +ngspice occ +oce openmp +python" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + ?? ( occ oce ) +" + +COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + python? ( + dev-python/wxpython:4.0[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + ) + >=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}] + github? ( net-misc/curl:=[ssl] ) + media-libs/glew:0= + media-libs/glm + media-libs/freeglut + media-libs/mesa + ngspice? ( + sci-electronics/ngspice[shared] + ) + occ? ( >=sci-libs/opencascade-6.8.0:= ) + oce? ( sci-libs/oce ) + >=x11-libs/cairo-1.8.8:= + >=x11-libs/pixman-0.30" +DEPEND="${COMMON_DEPEND} + doc? ( app-doc/doxygen ) + python? ( >=dev-lang/swig-3.0:0 )" +RDEPEND="${COMMON_DEPEND} + sci-electronics/electronics-menu +" +CHECKREQS_DISK_BUILD="800M" + +PATCHES=( + "${FILESDIR}"/"${PN}-5.1.0-help.patch" + "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use openmp && tc-check-openmp + setup-wxwidgets + check-reqs_pkg_setup +} + +src_configure() { + xdg_environment_reset + + local mycmakeargs=( + -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}" + -DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" + -DBUILD_GITHUB_PLUGIN="$(usex github)" + -DKICAD_SCRIPTING="$(usex python)" + -DKICAD_SCRIPTING_MODULES="$(usex python)" + -DKICAD_SCRIPTING_WXPYTHON="$(usex python)" + -DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)" + -DKICAD_SCRIPTING_PYTHON3="$(usex python)" + -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)" + -DKICAD_SPICE="$(usex ngspice)" + -DKICAD_USE_OCC="$(usex occ)" + -DKICAD_USE_OCE="$(usex oce)" + -DKICAD_INSTALL_DEMOS="$(usex examples)" + ) + use python && mycmakeargs+=( + -DPYTHON_DEST="$(python_get_sitedir)" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + ) + use occ && mycmakeargs+=( + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/lib + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use doc; then + cmake-utils_src_compile dev-docs doxygen-docs + fi +} + +src_install() { + cmake-utils_src_install + use python && python_optimize + if use doc ; then + dodoc uncrustify.cfg + cd Documentation || die + dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/. + fi +} + +pkg_postinst() { + optfeature "Component symbols library" sci-electronics/kicad-symbols + optfeature "Component footprints library" sci-electronics/kicad-footprints + optfeature "3D models of components " sci-electronics/kicad-packages3d + optfeature "Project templates" sci-electronics/kicad-templates + optfeature "Different languages for GUI" sci-electronics/kicad-i18n + optfeature "Extended documentation" app-doc/kicad-doc + optfeature "Creating 3D models of components" media-gfx/wings + + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} diff --git a/sci-electronics/kicad/kicad-5.1.2.ebuild b/sci-electronics/kicad/kicad-5.1.2.ebuild deleted file mode 100644 index c739de95232c..000000000000 --- a/sci-electronics/kicad/kicad-5.1.2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Can switch to EAPI=7 when wxwidgets eclass also supports it -EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) - -WX_GTK_VER="3.0-gtk3" - -inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils - -DESCRIPTION="Electronic Schematic and PCB design tools" -HOMEPAGE="http://www.kicad-pcb.org" -SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz" - -LICENSE="GPL-2+ GPL-3+ Boost-1.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples github +ngspice occ +oce openmp +python" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - ?? ( occ oce ) -" - -COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - python? ( - dev-python/wxpython:4.0[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}] - github? ( net-misc/curl:=[ssl] ) - media-libs/glew:0= - media-libs/glm - media-libs/freeglut - media-libs/mesa - ngspice? ( - sci-electronics/ngspice[shared] - ) - occ? ( >=sci-libs/opencascade-6.8.0:= ) - oce? ( sci-libs/oce ) - >=x11-libs/cairo-1.8.8:= - >=x11-libs/pixman-0.30" -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) - python? ( >=dev-lang/swig-3.0:0 )" -RDEPEND="${COMMON_DEPEND} - sci-electronics/electronics-menu -" -CHECKREQS_DISK_BUILD="800M" - -PATCHES=( - "${FILESDIR}"/"${PN}-5.1.0-help.patch" -) - -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 -} -- cgit v1.2.3-65-gdbad