commit: 22fe2623355fa8f7045537cd84b76bb3aef436fc Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> AuthorDate: Fri Sep 7 12:01:37 2018 +0000 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> CommitDate: Fri Sep 7 12:01:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fe2623
sci-electronics/kicad: remove old Package-Manager: Portage-2.3.49, Repoman-2.3.10 sci-electronics/kicad/Manifest | 5 - .../kicad/files/kicad-4.0.4-boost-context.patch | 107 ----------- sci-electronics/kicad/kicad-4.0.4.ebuild | 204 --------------------- 3 files changed, 316 deletions(-) diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 8ef3f97151a..80f7881b37e 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,10 +1,5 @@ -DIST kicad-4.0.4-i18n.tar.gz 2409039 BLAKE2B 95e0e8c8b001957df1f244ba5fef5b36658c75b3c903b495faab8c8ccb524d02dbb79b0197fa0485fc5f93a5a0088861bada57cd85d7982191437bdf8f7b1f3c SHA512 5fcbf54aeff92c142652908dda9e727e8b076aec4531f2bb4d27aa9fd946e92621141a9709a9469c133010cca019e4e6bc9731366e8c1adbe38078f5a6fcaedf -DIST kicad-4.0.4.tar.xz 10672424 BLAKE2B 16bef2545e697757be270eeff6820e75b1a79a37528f264e127587131c519cbdf67a774a4a9a8ff32c90b236279746ffd2164cb4d8885dc68d2664ef3dd178de SHA512 230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242 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.0.tar.xz 14284708 BLAKE2B 9f4414c4476aca8f2da1d7171b53f56d5ea216f11fc025695a228f93ec05e2f271cbab8429ed39445602a3a0707a31d44cce83eae0ad651167c471f52f3867cd SHA512 79d4d34e8eaa5b6e4c7baac39a76f86af89adbaf3f9181b8cd846ed3a8db1b4c6dd7a36efefda3394d33ef828917909ad3bd8bb22435af9c6f671efbff125b42 -DIST kicad-footprints-4.0.4.tar.gz 1400434 BLAKE2B eaf81e977a3d65305034f60eff18f6955cf6b805c2a28a2019c4bb2bd8de9868906a0f9e5ac17810c4779940c6b78e06472661966775cfb196b8cd8fc1ae4083 SHA512 7d42eea2c7c84961e05e0e61d6380e3d294d696e1321bb4406391125379fd6a3dc2b38e7ff8be51b684786bed892738452218f4c5a95c547319f1eaafc0cea6e DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f -DIST kicad-libcontext.tar.gz 25599 BLAKE2B b8871ab552745dfe29504b97c3c3e23f9e63100ef108c5a116512029f4973791e3d2bca240877319ee177f0a28da4a7946ae5cfaf18eaca0f5b0b1660335a520 SHA512 3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9 -DIST kicad-library-4.0.4.tar.gz 87947075 BLAKE2B b9176ad7ba05f32a5ed42012818a7636fd0f8993630627480557c3d8ab99884b31090f66f438a86dbc842677629cca629333be1d7b05f06a3c12373e57622954 SHA512 57f905277cf581cfda6ca574d87bbdd3a870cd240a151b2c8faedc7ecbfa2cc122b67937cbdbf028be77727cdf4fac9cdc3512ce5bfe80d0f6cbb4f444ccfd6c DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360 diff --git a/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch b/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch deleted file mode 100644 index 529a82c018f..00000000000 --- a/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch +++ /dev/null @@ -1,107 +0,0 @@ -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.4.ebuild b/sci-electronics/kicad/kicad-4.0.4.ebuild deleted file mode 100644 index 6c75dc7aba9..00000000000 --- a/sci-electronics/kicad/kicad-4.0.4.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -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"; -LIBCONTEXT_COMMIT="3d92a1a50f4749b5a92131a957c9615473be85b4" - -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 ) - 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 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:${WX_GTK_VER}[X,opengl] - python? ( - dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.56[nls,threads,python?] - 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() { - 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 -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}/${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 - - # 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//-/_}" - 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 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 - else - # remove additional demos/examples as its not strictly required to run the binaries - 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 -} - -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) - $(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 - 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 - 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 -}
