summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Puskas <zoltan@sinustrom.info>2023-01-26 22:53:00 -0800
committerJoonas Niilola <juippis@gentoo.org>2023-01-27 09:42:07 +0200
commit8c47b89a01cc8cc46121199be8c50e564eb081b6 (patch)
tree7d6ab1c2d8f3409a0f5f32d568219c2015f1c188 /sci-electronics
parentsci-electronics/kicad-meta: drop 5.1.12 (diff)
downloadgentoo-8c47b89a01cc8cc46121199be8c50e564eb081b6.tar.gz
gentoo-8c47b89a01cc8cc46121199be8c50e564eb081b6.tar.bz2
gentoo-8c47b89a01cc8cc46121199be8c50e564eb081b6.zip
sci-electronics/kicad: drop 5.1.12-r3
Signed-off-by: Zoltan Puskas <zoltan@sinustrom.info> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/kicad/Manifest1
-rw-r--r--sci-electronics/kicad/files/kicad-5.1.5-help.patch117
-rw-r--r--sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch17
-rw-r--r--sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch25
-rw-r--r--sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch30
-rw-r--r--sci-electronics/kicad/kicad-5.1.12-r3.ebuild170
-rw-r--r--sci-electronics/kicad/metadata.xml2
7 files changed, 0 insertions, 362 deletions
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index b1a0ea3ed005..4546d883c102 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,4 +1,3 @@
-DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c6666844c5bc9d0ec2 SHA512 c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a
DIST kicad-6.0.7.tar.gz 45143677 BLAKE2B 4ab9132be84cb6c6c566a826e5966f4fe64922dcd66f78c558126b37a276e075af80440da35071c864457298f6f964ba15511d0038424f473c3fb079d5f042e6 SHA512 0466650d166becbde23f1202e8bbe73ac7c743b5baad9608252fe4e960f0d15aad363664b69d840ef4568bf6d1c042b94252afce8657594a5f8193c979613e0e
DIST kicad-6.0.9.tar.gz 45166663 BLAKE2B e4d45c589a8e76d7c121ac4ab7adefc5fd44d4ccbff7140196caec56c309f6e83d47a3ea9cf79f59de57c3bda43b3d32a2bea82c5850c2a7a58a6e1db27a06a7 SHA512 49e6bd3c9f6e0c9839c4fac18dc12dc7ef16183f6fbe8091992e2223c7fb085b3119d46797c0b0cf86fd2813e3c4def9eb1f2adbff1bf072a363f1a501da9354
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-help.patch b/sci-electronics/kicad/files/kicad-5.1.5-help.patch
deleted file mode 100644
index 1b37e3013c1e..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
---- kicad-5.1.5-orig/CMakeLists.txt 2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/CMakeLists.txt 2019-12-15 03:41:57.574995996 -0800
-@@ -442,6 +442,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.1.5-orig/CMakeModules/config.h.cmake kicad-5.1.5/CMakeModules/config.h.cmake
---- kicad-5.1.5-orig/CMakeModules/config.h.cmake 2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/CMakeModules/config.h.cmake 2019-12-15 03:42:00.368013375 -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.1.5-orig/common/searchhelpfilefullpath.cpp kicad-5.1.5/common/searchhelpfilefullpath.cpp
---- kicad-5.1.5-orig/common/searchhelpfilefullpath.cpp 2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/common/searchhelpfilefullpath.cpp 2019-12-15 03:42:03.168030796 -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>
- #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.5-ldflags.patch b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
deleted file mode 100644
index 1495037b1b72..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
---- kicad-5.1.5-orig/CMakeLists.txt 2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/CMakeLists.txt 2019-11-19 02:08:32.309282631 -0800
-@@ -355,10 +355,10 @@
-
- elseif( NOT APPLE )
- # Thou shalt not link vaporware and tell us it's a valid DSO (apple ld doesn't support it)
-- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
-+ set( CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" )
-+ set( CMAKE_MODULE_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" )
-
-- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
-+ set( CMAKE_EXE_LINKER_FLAGS_RELEASE "$ENV{LDFLAGS} -s" )
-
- # Defeat ELF's ability to use the GOT to replace locally implemented functions
- # with ones from another module.
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch b/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch
deleted file mode 100644
index b01a6b7d79f6..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp
-index b265e2363..eb1187d86 100644
---- a/eeschema/dialogs/dialog_spice_model.cpp
-+++ b/eeschema/dialogs/dialog_spice_model.cpp
-@@ -34,6 +34,7 @@
- #include <wx/wupdlock.h>
-
- #include <cctype>
-+#include <cstring>
-
- // Helper function to shorten conditions
- static bool empty( const wxTextCtrl* aCtrl )
-@@ -804,9 +804,11 @@ bool DIALOG_SPICE_MODEL::addPwlValue( const wxString& aTime, const wxString& aVa
- float timeF;
- m_pwlTime->GetValue().ToDouble( &timeD );
- timeF = timeD;
-+ long data;
-+ std::memcpy( &data, &timeF, sizeof( timeF ) );
-
- // Store the time value, so the entries can be sorted
-- m_pwlValList->SetItemData( idx, *reinterpret_cast<long*>( &timeF ) );
-+ m_pwlValList->SetItemData( idx, data );
-
- // Sort items by timestamp
- m_pwlValList->SortItems( comparePwlValues, -1 );
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
deleted file mode 100644
index 675ff749de8d..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/kicad-5.1.12-r3.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
deleted file mode 100644
index 7c3cfe6697f1..000000000000
--- a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_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 openmp +python"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
-COMMON_DEPEND="
- dev-libs/boost:=[context,nls]
- 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-7.5.3:0=[vtk(+)] )
- python? (
- $(python_gen_cond_dep '
- dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
- dev-python/wxpython:4.0[${PYTHON_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.5-strict-aliasing.patch"
- "${FILESDIR}/${PN}-5.1.6-metainfo.patch"
- "${FILESDIR}/${PN}-5.1.5-ldflags.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
- use python && python-single-r1_pkg_setup
- 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_prepare() {
- # Fix OpenCASCADE lookup
- sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
- -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
- -i CMakeModules/FindOpenCASCADE.cmake || die
-
- cmake_src_prepare
-}
-
-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_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)"
- )
- if use occ; then
- mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
- )
- fi
-
- 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/metadata.xml b/sci-electronics/kicad/metadata.xml
index a75b4ff9ecf1..36c0a94d2d79 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -10,10 +10,8 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
- <flag name="github">Add github support into PCB editor</flag>
<flag name="ngspice">Enable circuit simulation</flag>
<flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
- <flag name="python">Enable python scripting support</flag>
<flag name="pcm">Enable plugin content manager</flag>
</use>
<longdescription>