sci-electronics/kicad: drop 7.0.0-r1

Signed-off-by: Zoltan Puskas <zoltan@sinustrom.info>
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 0 insertions, 270 deletions

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 5ac6dc4f06c6..bc70fd05ea21 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,5 +1,4 @@
 DIST kicad-6.0.11.tar.bz2 34083016 BLAKE2B 85662dd57eb5f28498317b1554e703efdebaa470f749ca239b2caeae4c366005a7c9bb1d1ba6375ed80d277efabf09b56d3e7e1e82bf93462b4ba5405445157e SHA512 9827be9f2c18be1ab3bc5a1a3bd3d6297bc69b561e43b0f9010cb49009c3e87f1d320034411ecc0a2277b5686923a3d4bcc507278590814309d10de14463266d
 DIST kicad-6.0.9.tar.bz2 34045371 BLAKE2B 797f1d10a5405751bc51ec9579c5c50c21b56761c8b59ae99e8a52e50a787f1271053eb4d36e5c2483adee277764ea75300dd50c62a2addeb540e748bf8b93fe SHA512 015335de5d9bbd4acdff8dd7da85847ea0b666d3d4dd0d4c9e7b731cc516cb3575ade231e742a089cc5591ef9e4059f2bedc83677fa85220b9e6cb8ef5776305
-DIST kicad-7.0.0.tar.bz2 42583715 BLAKE2B 24fefe73bce6254bb47fdf21e8a82b7752e3f58cb3ea61220f0cf008c6570a4378f15bad54b81cc9257ec223bdb6128ccfd33f356e738b112c7b0e9481257255 SHA512 cb6f4cf6eee9a583d3a622bf8e48e5b604b047df0d742081cff1e5e387cf97cc1cd3f03fb58a17b44c47085634b95eea642bd1a6805e80807dbe0473c8d19d96
 DIST kicad-7.0.1.tar.bz2 42744121 BLAKE2B cb6005be531027e02c5c3fa03be54dff00720aa9c36d12d1e619e041da05e5b4efd048be4e01021cf225a35cd638a162f4b620b65ec117027092a5bf650cb1ec SHA512 6b3f32073a0667c745be54fccf1660cc81b560ad7613eb2355956b48567d7e82ce6926ab04d374fe88dcaa1220357997f5f4621e6d635effcd3d698e45a37516
 DIST kicad-7.0.2.tar.bz2 42844186 BLAKE2B 136d68b3174cde74db96b1197c62da1fb4e54f628f73a6e0ea092c713b529863d9e443b6631a0ecbb55e2d299a7b78b8218d05e605f8ae8f5972915147ec140f SHA512 04d7e39815f9e87b8646f25fb7e1b82bcf2bc63e26e078f3175c37a2c2e0a2bb7771e70e4698dbfc496f112a733668bdc746eefd1a9c4c76d0b36696738026a4
diff --git a/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch b/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch
deleted file mode 100644
index 9ef12e97b573..000000000000
--- a/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From b536580119c59fde78e38d8d6388f2540ecb6cf9 Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Mon, 13 Feb 2023 21:24:26 +0000
-Subject: [PATCH] Support subrelease field in wxWidgets cmake detection
-
-Sometimes wxWidgets increments the subrelease to a non-zero value, and
-since wxPython will report a subrelease, we must ensure we can get the
-subrelease from the wx library properly, otherwise configure will fail
-thinking the library isn't the same version as that used by wxPython.
-
-Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13887
---- a/cmake/FindwxWidgets.cmake
-+++ b/cmake/FindwxWidgets.cmake
-@@ -926,8 +926,17 @@ if(wxWidgets_FOUND)
-     "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
-   string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
-     "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
--  set(wxWidgets_VERSION_STRING
--    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
-+  string(REGEX REPLACE "^(.*\n)?#define +wxSUBRELEASE_NUMBER +([0-9]+).*"
-+    "\\2" wxWidgets_VERSION_SUBRELEASE "${_wx_version_h}" )
-+
-+  if( ${wxWidgets_VERSION_SUBRELEASE} GREATER 0 )
-+    set(wxWidgets_VERSION_STRING
-+      "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}.${wxWidgets_VERSION_SUBRELEASE}" )
-+  else()
-+    set(wxWidgets_VERSION_STRING
-+      "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
-+  endif()
-+
-   DBG_MSG("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
- endif()
- 
--- 
-From 1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c Mon Sep 17 00:00:00 2001
-From: Ian McInerney <ian.s.mcinerney@ieee.org>
-Date: Tue, 14 Feb 2023 00:18:56 +0000
-Subject: [PATCH] Relax wxPython version mismatch check to major.minor
-
-The previous version check failed when the version was even slightly
-different, including on the revision field. Theoretically the ABI of the
-wx minor versions in use should be the same, so this might work. On the
-other hand, with wxPython it could break as well. YOLO.
---- a/scripting/python_scripting.cpp
-+++ b/scripting/python_scripting.cpp
-@@ -50,6 +50,7 @@
- #include <kiplatform/environment.h>
- 
- #include <wx/app.h>
-+#include <wx/regex.h>
- #include <wx/utils.h>
- 
- #include <config.h>
-@@ -128,7 +129,39 @@ except:
-                                            wxVI.GetMajor(), wxVI.GetMinor(), wxVI.GetMicro() );
-         version = version.Mid( idx + 10 );
- 
--        if( wxVersion.Cmp( version ) != 0 )
-+        int wxPy_major = 0;
-+        int wxPy_minor = 0;
-+        int wxPy_micro = 0;
-+        int wxPy_rev   = 0;
-+
-+        // Compile a regex to extract the wxPython version
-+        wxRegEx re( "([0-9]+)\\.([0-9]+)\\.?([0-9]+)?\\.?([0-9]+)?" );
-+        wxASSERT( re.IsValid() );
-+
-+        if( re.Matches( version ) )
-+        {
-+            wxString v = re.GetMatch( version, 1 );
-+
-+            if( !v.IsEmpty() )
-+                v.ToInt( &wxPy_major );
-+
-+            v = re.GetMatch( version, 2 );
-+
-+            if( !v.IsEmpty() )
-+                v.ToInt( &wxPy_minor );
-+
-+            v = re.GetMatch( version, 3 );
-+
-+            if( !v.IsEmpty() )
-+                v.ToInt( &wxPy_micro );
-+
-+            v = re.GetMatch( version, 4 );
-+
-+            if( !v.IsEmpty() )
-+                v.ToInt( &wxPy_rev );
-+        }
-+
-+        if( ( wxVI.GetMajor() != wxPy_major ) || ( wxVI.GetMinor() != wxPy_minor ) )
-         {
-             wxString msg = wxT( "The wxPython library was compiled against wxWidgets %s but KiCad is "
-                                 "using %s.  Python plugins will not be available." );
--- 
diff --git a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
deleted file mode 100644
index a6db98a4f37a..000000000000
--- a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-WX_GTK_VER="3.2-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"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	fi
-fi
-
-# BSD for bundled pybind
-LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
-SLOT="0"
-IUSE="doc examples +ngspice nls openmp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Contains bundled pybind but it's patched for wx
-# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
-# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
-COMMON_DEPEND="
-	dev-db/unixODBC
-	dev-libs/boost:=[context,nls]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	net-misc/curl
-	>=sci-libs/opencascade-7.3.0:0=
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
-		~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	nls? (
-		sys-devel/gettext
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND=">=dev-lang/swig-4.0
-	doc? ( app-doc/doxygen )"
-
-if [[ ${PV} == 9999 ]] ; then
-	# x11-misc-util/macros only required on live ebuilds
-	BDEPEND+=" >=x11-misc/util-macros-1.18"
-fi
-
-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() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-
-		-DKICAD_SCRIPTING_WXPYTHON=ON
-		-DKICAD_USE_EGL=ON
-
-		-DKICAD_BUILD_I18N="$(usex nls)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
-
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-
-		-DKICAD_SPICE="$(usex ngspice)"
-
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doxygen-docs
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
-
-	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
-	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	dodoc doxygen/eagle-plugin-notes.txt
-
-	if use doc ; then
-		cd doxygen || die
-		dodoc -r out/html/.
-	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
-}