From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
Date: Wed, 29 Jun 2016 17:56:52 +0000 (UTC) [thread overview]
Message-ID: <1467223007.f228caa38719ad848fa163366c8f96a4d9ded711.mgorny@gentoo> (raw)
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
+}
next reply other threads:[~2016-06-29 17:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 17:56 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-21 17:56 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/ Matthew Smith
2021-01-18 10:14 David Seifert
2020-06-06 17:47 Alexey Shvetsov
2020-06-06 17:47 Alexey Shvetsov
2020-05-14 10:36 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-18 7:42 Jason Zaman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467223007.f228caa38719ad848fa163366c8f96a4d9ded711.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox