diff options
Diffstat (limited to 'sci-electronics')
175 files changed, 2947 insertions, 3498 deletions
diff --git a/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch b/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch index cebe3c5239fa..d49cef3f53c6 100644 --- a/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch +++ b/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch @@ -8,6 +8,16 @@ using namespace std; typedef function<void(string dut_name, double cableLen1, double cableLen2)> xavna_ui_changed_cb; +--- a/vna_qt/firmwareupdater.H ++++ b/vna_qt/firmwareupdater.H +@@ -2,6 +2,7 @@ + #define FIRMWAREUPDATER_H + #include <string> + #include <functional> ++#include <cstdint> + #include <pthread.h> + using namespace std; + --- a/vna_qt/polarview.C +++ b/vna_qt/polarview.C @@ -3,6 +3,7 @@ @@ -18,3 +28,13 @@ PolarView::PolarView(QWidget *parent) : QWidget(parent) { +--- a/vna_qt/polarview.H ++++ b/vna_qt/polarview.H +@@ -5,6 +5,7 @@ + #include <QImage> + #include <vector> + #include <complex> ++#include <cstdint> + using namespace std; + + diff --git a/sci-electronics/NanoVNA-QT/metadata.xml b/sci-electronics/NanoVNA-QT/metadata.xml index 84af1563757c..833cf3134f85 100644 --- a/sci-electronics/NanoVNA-QT/metadata.xml +++ b/sci-electronics/NanoVNA-QT/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">nanovna-v2/NanoVNA-QT</remote-id> </upstream> diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest index 151cae87e0d1..95a1de9a0fc2 100644 --- a/sci-electronics/eagle/Manifest +++ b/sci-electronics/eagle/Manifest @@ -1,3 +1 @@ DIST Autodesk_EAGLE_9.6.2_English_Linux_64bit.tar.gz 171780187 BLAKE2B 6fb627448068b8af8fb2a4117c84386a300acef769afe8524cae703afb09edf719f19fc4a5298d091667f3d4c09e8ec06a0da4a16274cb6e6c64a1ae349ed014 SHA512 4ef17dfa52b1ee0f5ba68896bc3821616a1b7d1a073a586604271cd7129e29671c480cd324cc5eadc517eb300ca4be6efa69423a306944e36732c2aa34cc59a3 -DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c61891ebab7e3f59d41aaa0c6ecaea2f050ced62552656a2311542fee497dbe8fbe43c958a8e76a9b00217c430f678072 SHA512 7ebe73bcd71857c5b8087e911ebfc45507715725abab15b80c9800476128790f8e373d01c52c05a87102597d355390ca0687964eff74af1283b162fba8dbb53b -DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770 diff --git a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild deleted file mode 100644 index 713f28d478b3..000000000000 --- a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit desktop - -DESCRIPTION="CadSoft EAGLE schematic and printed circuit board (PCB) layout editor" -HOMEPAGE="http://www.cadsoft.de" -SRC_URI=" - x86? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin32-${PV}.run ) - amd64? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin64-${PV}.run )" - -LICENSE="cadsoft-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="doc" - -QA_PREBUILT="opt/eagle/bin/eagle" -RESTRICT="mirror bindist" - -RDEPEND=" - sys-libs/glibc - || ( <dev-libs/openssl-1.1 dev-libs/openssl-compat:1.0.0 ) - >=sys-libs/zlib-1.2.8-r1 - >=media-libs/freetype-2.5.0.1 - >=media-libs/fontconfig-2.10.92 - x11-libs/libXext - x11-libs/libX11 - >=x11-libs/libXrender-0.9.8 - >=x11-libs/libXrandr-1.4.2 - >=x11-libs/libXcursor-1.1.14 - >=x11-libs/libXi-1.7.2 - net-print/cups - x11-libs/libxcb -" - -# Append ${PV} since that's what upstream installs to -case "${LINGUAS}" in - *de*) - MY_LANG="de";; - *) - MY_LANG="en";; -esac - -src_unpack() { - # Extract the built-in .tar.bz2 file starting at __DATA__ - sed -e '1,/^__DATA__$/d' "${DISTDIR}/${A}" | tar xj || die "unpacking failed" -} - -src_install() { - local installdir="/opt/eagle" - - # Set MY_LANG for this function only since UPDATE_zh and README_zh - # don't exist - [[ ${LINGUAS} == *zh* ]] && MY_INST_LANG="zh" || MY_INST_LANG="${MY_LANG}" - - # Install the documentation - cd doc/ - - local pattern="^((README|UPDATE)_${MY_LANG}|library_${MY_LANG}\.txt)$" - for docs in README_* UPDATE_* library_*.txt; do - if [[ $docs =~ $pattern ]]; then - dodoc $docs - fi - - rm -f $docs - done - - doman eagle.1 - rm eagle.1 - - # Install extra documentation if requested - pattern="^((tutorial|manual|generate-3d-idf-data)_|(connect-device-split-symbol|make-symbol-device-package-bsdl-2011)-)${MY_LANG}.pdf$" - if use doc; then - cd ulp/ - for docs in generate-3d-idf-data_*.pdf connect-device-split-symbol-*.pdf make-symbol-device-package-bsdl-2011-*.pdf; do - if [[ ! $docs =~ $pattern ]]; then - rm $docs - fi - done - cd ../ - - for docs in manual_* tutorial_*; do - if [[ ! $docs =~ $pattern ]]; then - rm $docs - fi - done - else - rm {elektro-tutorial,manual_*,tutorial_*,layer-setup_designrules}.pdf - rm -rf ulp/ - fi - - rm -f license*.txt eagle.dtd - - cd "${S}" - - insinto $installdir - doins -r . - - fperms 0755 ${installdir}/bin/eagle - - # Install wrapper (suppressing leading tabs) - # see bug #188368 or http://www.cadsoftusa.com/training/faq/#3 - exeinto /opt/bin - newexe "${FILESDIR}/eagle_wrapper_script" eagle - # Finally, append the path of the eagle binary respecting $installdir and any - # arguments passed to the script (thanks Denilson) - echo "${installdir}/bin/eagle" '"$@"' >> "${D}/opt/bin/eagle" - - echo -e "ROOTPATH=${installdir}/bin\nPRELINK_PATH_MASK=${installdir}" > "${S}/90eagle-${PV}" - doenvd "${S}/90eagle-${PV}" - - # Create desktop entry - newicon bin/${PN}icon50.png ${PF}-icon50.png - make_desktop_entry "${EPREFIX}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics" -} - -pkg_postinst() { - elog "Run \`env-update && source /etc/profile\` from within \${ROOT}" - elog "now to set up the correct paths." - elog "You must first run eagle as root to invoke product registration." - echo - ewarn "Due to some necessary changes in the data structure, once you edit" - ewarn "a file with version 7.x you will no longer be able to edit it" - ewarn "with versions prior to 7.0!" - ewarn - ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from a version prior 7.x!" -} diff --git a/sci-electronics/eagle/files/eagle_wrapper_script b/sci-electronics/eagle/files/eagle_wrapper_script deleted file mode 100644 index 5a20922893c6..000000000000 --- a/sci-electronics/eagle/files/eagle_wrapper_script +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# From http://www.cadsoft.de/faq.htm#17040701 -# Work around problems with the Composite X extension -export XLIB_SKIP_ARGB_VISUALS=1 - -# The ebuild will append the final line respecting INSTALLDIR -# Default is /opt/eagle/bin/eagle "$@" diff --git a/sci-electronics/electric/Manifest b/sci-electronics/electric/Manifest index 843f33a477e1..7e7343f964d0 100644 --- a/sci-electronics/electric/Manifest +++ b/sci-electronics/electric/Manifest @@ -1,2 +1 @@ -DIST electricBinary-9.03.jar 23591444 BLAKE2B f5185917821855eed90dbd39dc8f6a390c9b117c06d960a01ef7061ec7650d13b549950e53c43c4bd0864c0adebc32c1c2e5c68a32dd09f2f46d0111aa8a7fe0 SHA512 e4430c87e1c0d335341057950b887988f46bd222ab6c2d989312036592f16db0b51169f3affc01fe0dbd8077674ed934d4896de46a0f9ee00e71453b2a6b18f2 DIST electricBinary-9.07.jar 21244560 BLAKE2B 23ad96fc7b213776e0296e281bd289f554261df85738f30b5369f743523231456b8e29f9b18a26ac338c2f093ec514ce219997b763c92aaa0870339af7732f31 SHA512 1f9a1cc061b99c868df25c3bf1da3e21e9d26dc25b6c72b10c8f53488f3ddf0d522e821d4cd57eb85c95fe903fb6ada0d92d501f577d0fe4934988bb4c2d596a diff --git a/sci-electronics/electric/electric-9.03.ebuild b/sci-electronics/electric/electric-9.03.ebuild deleted file mode 100644 index eddba70359cf..000000000000 --- a/sci-electronics/electric/electric-9.03.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop java-pkg-2 - -DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design" -HOMEPAGE="https://www.gnu.org/software/electric/electric.html" -SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=virtual/jre-1.6 - sci-electronics/electronics-menu" -DEPEND="app-arch/unzip" - -S=${WORKDIR} - -src_install() { - java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar - java-pkg_dolauncher ${PN} - - newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png - make_desktop_entry electric "Electric VLSI Design System" electric "Electronics" -} diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild index 8a6fb4140dd1..1eb3d3d4e2cd 100644 --- a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild +++ b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,4 +11,4 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv sparc ~x86" diff --git a/sci-electronics/espresso-ab/espresso-ab-1.0-r3.ebuild b/sci-electronics/espresso-ab/espresso-ab-1.0-r3.ebuild index 2937cb028c81..2067bda91c74 100644 --- a/sci-electronics/espresso-ab/espresso-ab-1.0-r3.ebuild +++ b/sci-electronics/espresso-ab/espresso-ab-1.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/other-software/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" +KEYWORDS="amd64 ~ppc ~sparc ~x86" src_prepare() { default diff --git a/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild index ee1cef974df8..b6277e0a9e1c 100644 --- a/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild +++ b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Three dimensional inductance computation program, Whiteley Research version" HOMEPAGE="http://www.wrcad.com/freestuff.html" @@ -27,6 +27,14 @@ PATCHES=( ) src_compile() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862450 + # + # Upstream provides a contact email. I have sent an email describing the + # bug. They responded to say it is now fixed and a new version will be + # available shortly. + filter-lto + tc-export CC AR emake all } diff --git a/sci-electronics/freehdl/Manifest b/sci-electronics/freehdl/Manifest deleted file mode 100644 index 3b2fb612e71c..000000000000 --- a/sci-electronics/freehdl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST freehdl-0.0.8.tar.gz 1389888 BLAKE2B 2205f07435bf3cd79d51ccec4c976de5c1d0eb30279ebbaf3bd9ebda274508501421bd6c0b10c2f73989ee4a01f0cc09bfb0542e5e442ea509911fdb5e9ee172 SHA512 731fde1a940a762e570107819a89ac2884029e5c4f5d51e5df0032a4381fd04c7da948b5f2de6b1ce60801f6ce3a0a9123a4902e75e216a1182b25b2134f44ee diff --git a/sci-electronics/freehdl/files/freehdl-0.0.8-fix-c++14.patch b/sci-electronics/freehdl/files/freehdl-0.0.8-fix-c++14.patch deleted file mode 100644 index 6da5bb1b27a1..000000000000 --- a/sci-electronics/freehdl/files/freehdl-0.0.8-fix-c++14.patch +++ /dev/null @@ -1,507 +0,0 @@ -C++11 has added new types (std::hash), which get dropped into the namespace due to -awful 'using namespace std;' declarations everywhere, causing name collisions. -Instead, only drop a minimal set of declarations into the global :: namespace. -See also: https://bugs.gentoo.org/show_bug.cgi?id=594706 - ---- a/fire/test-fire.cc -+++ b/fire/test-fire.cc -@@ -2,7 +2,7 @@ - #include <stdio.h> - #include <freehdl/fire.h> - --using namespace std; -+using std::cout; - - extern tree_chunk_info fire_chunk_info; - ---- a/freehdl/cdfggen-chunk.h -+++ b/freehdl/cdfggen-chunk.h -@@ -7,7 +7,9 @@ - #include <string> - #include <vector> - typedef enum {to, downto} cdfgg_direction; --using namespace std; -+using std::string; -+using std::vector; -+using std::pair; - - extern tree_chunk_info cdfggen_chunk_info; - extern tree_ctype_info int_ctype_info; ---- a/freehdl/cdfggen-chunk.t -+++ b/freehdl/cdfggen-chunk.t -@@ -13,8 +13,7 @@ - (header-add "#include <freehdl/tree-supp.h>" - "#include <string>" - "#include <vector>" -- "typedef enum {to, downto} cdfgg_direction;" -- "using namespace std;") -+ "typedef enum {to, downto} cdfgg_direction;") - - (impl-add "#include <freehdl/cdfggen-chunk.h>") - ---- a/freehdl/kernel-attributes.hh -+++ b/freehdl/kernel-attributes.hh -@@ -1,6 +1,8 @@ - #ifndef FREEHDL_KERNEL_ATTRIBUTES_H - #define FREEHDL_KERNEL_ATTRIBUTES_H - -+using std::max; -+ - /* ************************************************************* - * Function kind attributes for signals - * ************************************************************* */ ---- a/freehdl/kernel-db.hh -+++ b/freehdl/kernel-db.hh -@@ -3,6 +3,8 @@ - - #include <assert.h> - -+#include <string> -+using std::string; - - /* This header file includes the definitions that are required to - * setup a kernel database. This database will be used by the kernel -@@ -254,7 +256,7 @@ - - // A hash function template used tp generate a hash number from - // d --class db_basic_key_hash : public hash<unsigned long> { -+class db_basic_key_hash : public __gnu_cxx::hash<unsigned long> { - public: - size_t operator()(const db_basic_key& x) const { - return (*(hash<unsigned long> *)this)(((unsigned long)x.value)>>2); ---- a/freehdl/kernel-dump.hh -+++ b/freehdl/kernel-dump.hh -@@ -13,9 +13,9 @@ - #include <string> - #include <fstream> - --using namespace std; -+using std::fstream; - --typedef map<string, char*, less<string> > Tmap; -+typedef map<string, const char*, less<string> > Tmap; - extern Tmap mapping_translation_table; - - // For each signal which is dumped an virtual process is created. This ---- a/freehdl/kernel-fhdl-stream.hh -+++ b/freehdl/kernel-fhdl-stream.hh -@@ -9,7 +9,9 @@ - #include <string> - #include <iostream> - --using namespace std; -+using std::istream; -+using std::ostream; -+using std::string; - - struct fhdl_ostream_t { - union { ---- a/freehdl/kernel-map-list.hh -+++ b/freehdl/kernel-map-list.hh -@@ -7,7 +7,6 @@ - #include <freehdl/kernel-acl.hh> - #include <freehdl/kernel-sig-info.hh> - --using namespace std; - //using namespace __gnu_cxx; - - // A signal_link instance describes the connection ---- a/freehdl/kernel-name-stack.hh -+++ b/freehdl/kernel-name-stack.hh -@@ -3,7 +3,7 @@ - - #include <string> - --using namespace std; -+using std::string; - - #define NAME_STACK_INCREMENT 10 - ---- a/freehdl/kernel-signal-source-list-array.hh -+++ b/freehdl/kernel-signal-source-list-array.hh -@@ -13,7 +13,6 @@ - #include <freehdl/kernel-util.hh> - #include <freehdl/kernel-source-descriptor.hh> - --using namespace std; - //using namespace __gnu_cxx; - - // signal_source stores information about a source of a signal. Note ---- a/freehdl/kernel-util.hh -+++ b/freehdl/kernel-util.hh -@@ -15,7 +15,8 @@ - #include <hash_map> - #endif - --using namespace std; -+using std::stringstream; -+using std::string; - - #if !defined __GNUC__ || __GNUC__ != 2 - using namespace __gnu_cxx; -@@ -24,7 +25,7 @@ - // A hash function template used tp generate a hash number from - // pointer values. - template<class T> --class pointer_hash : public hash<unsigned long> { -+class pointer_hash : public __gnu_cxx::hash<unsigned long> { - public: - size_t operator()(const T& x) const { - return (*(hash<unsigned long> *)this)(((unsigned long)x)>>2); ---- a/freehdl/std.h -+++ b/freehdl/std.h -@@ -1,7 +1,6 @@ - #ifndef FREEHDL_STD_H - #define FREEHDL_STD_H - --using namespace std; - - #include <freehdl/std-standard.hh> - #include <freehdl/std-vhdl-types.hh> ---- a/freehdl/std-vhdl-types.hh -+++ b/freehdl/std-vhdl-types.hh -@@ -6,13 +6,24 @@ - #include <float.h> - #include <math.h> - #include <iostream> -+#include <map> -+#include <list> -+#include <functional> - #include <string.h> - - #include <freehdl/std-memory.hh> - #include <freehdl/kernel-error.hh> - #include <freehdl/kernel-acl.hh> - --using namespace std; -+using std::string; -+using std::istream; -+using std::ostream; -+using std::min; -+using std::map; -+using std::stringstream; -+using std::list; -+using std::less; -+using std::iostream; - - typedef long long int lint; - const int BUFFER_STREAM_SIZE_INCREMENT = 1024; ---- a/freehdl/vaul-lexer.h -+++ b/freehdl/vaul-lexer.h -@@ -32,7 +32,6 @@ - #include <stdarg.h> - #include <string.h> - --using namespace std; - - #undef yyFlexLexer - #define yyFlexLexer vaul_FlexLexer ---- a/ieee/numeric_std.cc -+++ b/ieee/numeric_std.cc -@@ -2,6 +2,7 @@ - #include <freehdl/std.h> - - -+using std::max; - - /* package :ieee:numeric_std */ - /* External declarations */ ---- a/kernel/attributes.cc -+++ b/kernel/attributes.cc -@@ -5,6 +5,7 @@ - #include <freehdl/kernel-kernel-class.hh> - #include <freehdl/kernel-reader-info.hh> - #include <freehdl/kernel-driver-info.hh> -+using std::max; - #include <freehdl/kernel-attributes.hh> - - ---- a/kernel/db.cc -+++ b/kernel/db.cc -@@ -1,6 +1,5 @@ - #define KERNEL // Include internal kernel definitions - --using namespace std; - #include <freehdl/kernel-db.hh> - - ---- a/kernel/fhdl_stream.cc -+++ b/kernel/fhdl_stream.cc -@@ -7,6 +7,9 @@ - #include <freehdl/kernel-error.hh> - #include <freehdl/kernel-fhdl-stream.hh> - -+using std::cin; -+using std::cout; -+using std::stringstream; - - // Error stream to output error messages generated by the kernel, - // e.g. to print error messages due to invalid simulator commands ---- a/kernel/kernel_class.cc -+++ b/kernel/kernel_class.cc -@@ -16,6 +16,10 @@ - #include <freehdl/kernel-resolver-descriptor.hh> - #include <freehdl/kernel-fhdl-stream.hh> - -+using std::cerr; -+using std::pair; -+using std::binary_function; -+ - // Arguments that are passed in form the command line - int main_argc; - char **main_argv; ---- a/kernel/main.cc -+++ b/kernel/main.cc -@@ -34,6 +34,15 @@ - #include <freehdl/kernel-error.hh> - #include <freehdl/kernel-fhdl-stream.hh> - -+using std::ios; -+using std::ifstream; -+using std::ofstream; -+using std::ostringstream; -+using std::cin; -+using std::cerr; -+using std::cout; -+using std::endl; -+ - #ifdef PERFMON_STATISTICS - #include "pcounter.hh" - #endif ---- a/kernel/map_list.cc -+++ b/kernel/map_list.cc -@@ -4,6 +4,8 @@ - #include <freehdl/kernel-sig-info.hh> - #include <freehdl/kernel-resolver-descriptor.hh> - -+using std::max; -+ - // Stores the father signal(s) of port signals - port_signal_link_map_t port_signal_link_map; - ---- a/kernel/name_stack.cc -+++ b/kernel/name_stack.cc -@@ -1,8 +1,10 @@ - #include <stdlib.h> - #include <stdio.h> -+#include <stack> - #include <freehdl/kernel-error.hh> - #include <freehdl/kernel-name-stack.hh> - -+using std::stack; - - name_stack instance_name; - ---- a/kernel/persistent_cdfg_dump.cc -+++ b/kernel/persistent_cdfg_dump.cc -@@ -3,6 +3,7 @@ - #include <freehdl/kernel-persistent-cdfg-dump.hh> - #include <freehdl/kernel-persistent-dump.hh> - -+using std::endl; - - buffer_stream register_cdfg_tmp_buffer; - ---- a/kernel/sig_info.cc -+++ b/kernel/sig_info.cc -@@ -1,6 +1,5 @@ - #define KERNEL // Include internal kernel definitions - --using namespace std; - #include <freehdl/kernel-error.hh> - #include <freehdl/kernel-db.hh> - #include <freehdl/kernel-sig-info.hh> ---- a/std/internal_textio.cc -+++ b/std/internal_textio.cc -@@ -10,6 +10,10 @@ - #include <freehdl/kernel-name-stack.hh> - #include <freehdl/kernel-register.hh> - -+using std::ios; -+using std::cin; -+using std::cout; -+ - /* package :std:textio */ - - /* Definitions for access type :std:textio:line */ ---- a/std/vhdl_types.cc -+++ b/std/vhdl_types.cc -@@ -12,6 +12,9 @@ - #include <freehdl/kernel-register.hh> - - -+using std::ios; -+using std::ifstream; -+using std::ofstream; - - /* ************************************************************* - * Some global functions ---- a/v2cc/mapping.cc -+++ b/v2cc/mapping.cc -@@ -34,7 +34,12 @@ - #include <iostream> - #include <stdlib.h> - --using namespace std; -+using std::string; -+using std::list; -+using std::map; -+using std::istream; -+using std::ifstream; -+using std::cerr; - - v2cc_mapper::v2cc_mapper () - { ---- a/v2cc/v2cc.cc -+++ b/v2cc/v2cc.cc -@@ -35,7 +35,6 @@ - - */ - --using namespace std; - - #if HAVE_MALLOC_H - #include <malloc.h> ---- a/v2cc/v2cc-const-fold.cc -+++ b/v2cc/v2cc-const-fold.cc -@@ -16,6 +16,9 @@ - #include "v2cc-util.h" - - -+using std::cerr; -+using std::max; -+using std::min; - - // Used to generate error messages - extern vaul_error_printer codegen_error; ---- a/v2cc/v2cc-decl.cc -+++ b/v2cc/v2cc-decl.cc -@@ -13,6 +13,9 @@ - #include "mapping.h" - #include "v2cc-util.h" - -+using std::endl; -+using std::min; -+using std::max; - - void test (RegionStack &rstack) - { ---- a/v2cc/v2cc-explore.cc -+++ b/v2cc/v2cc-explore.cc -@@ -15,7 +15,6 @@ - #include "mapping.h" - #include "v2cc-util.h" - --using namespace std; - - // Used to generate error messages - extern vaul_error_printer codegen_error; ---- a/v2cc/v2cc.h -+++ b/v2cc/v2cc.h -@@ -1,7 +1,17 @@ - #ifndef V2CC_HEADER - #define V2CC_HEADER - --using namespace std; -+using std::vector; -+using std::list; -+using std::string; -+using std::pair; -+using std::string; -+using std::set; -+using std::less; -+using std::deque; -+using std::binary_function; -+using std::map; -+using std::binary_function; - - #include <freehdl/vaul.h> - #include "mapping.h" ---- a/v2cc/v2cc-qid.cc -+++ b/v2cc/v2cc-qid.cc -@@ -4,6 +4,7 @@ - #include "v2cc-util.h" - - -+using std::endl; - - // ****************************************************************************************** - // Name: m_qid , generic function ---- a/v2cc/v2cc-util.cc -+++ b/v2cc/v2cc-util.cc -@@ -9,6 +9,9 @@ - - #include "v2cc-util.h" - -+using std::endl; -+using std::hex; -+using std::dec; - - // ****************************************************************************************** - // Some global variables ---- a/v2cc/v2cc-util.h -+++ b/v2cc/v2cc-util.h -@@ -2,13 +2,18 @@ - #ifndef V2CC_UTIL_H - #define V2CC_UTIL_H - --using namespace std; - - #include <sstream> - #include <iomanip> - #include <freehdl/vaul.h> - #include "v2cc-chunk.h" - -+using std::stringstream; -+using std::setprecision; -+using std::showpoint; -+using std::ofstream; -+using std::cout; -+ - // ****************************************************************************************** - // Some global variables - // ****************************************************************************************** ---- a/vaul/bison-parser.cc -+++ b/vaul/bison-parser.cc -@@ -86,7 +86,6 @@ - #include <malloc.h> - #endif - --using namespace std; - - #define YYINITDEPTH 10000 - #define YYMAXDEPTH 100000 ---- a/vaul/bison-parser.yy -+++ b/vaul/bison-parser.yy -@@ -49,7 +49,6 @@ - #include <malloc.h> - #endif - --using namespace std; - - #define YYINITDEPTH 10000 - #define YYMAXDEPTH 100000 ---- a/vaul/printer.cc -+++ b/vaul/printer.cc -@@ -27,7 +27,8 @@ - #include <string.h> - #include <sstream> - --using namespace std; -+using std::ostringstream; -+using std::ostream; - - void vaul_printer::printf (const char *fmt, ...) - { ---- a/vaul/tree.cc -+++ b/vaul/tree.cc -@@ -31,7 +31,7 @@ - #include <assert.h> - #include <stdlib.h> - --using namespace std; -+using std::ostream; - - vaul_id_set::vaul_id_set(int dummy) - { diff --git a/sci-electronics/freehdl/files/freehdl-0.0.8-qa.patch b/sci-electronics/freehdl/files/freehdl-0.0.8-qa.patch deleted file mode 100644 index d35af9f69a69..000000000000 --- a/sci-electronics/freehdl/files/freehdl-0.0.8-qa.patch +++ /dev/null @@ -1,279 +0,0 @@ -Fix various QA issues: -* Use correct printf format specifiers for 'size_t' -* Fix const correctness ('char*' -> 'const char*') for C-string literals -* Correctly forward declare inline functions - ---- a/fire/test-fire.cc -+++ b/fire/test-fire.cc -@@ -24,7 +24,7 @@ - if (k->size < (size_t) N) - sizes[k->size]++; - if (k->size % 4 !=0) -- printf ("odd size: %d\n", k->size); -+ printf ("odd size: %zu\n", k->size); - } - printf ("min = %d, max = %d\n", min, max); - for (int i = min; i <= max && i < N; i+=4) ---- a/fire/tree-supp.cc -+++ b/fire/tree-supp.cc -@@ -485,7 +485,7 @@ - if (size < (size_t) N) - sizes[size]++; - if (size % 4 !=0) -- printf ("odd size: %d\n", size); -+ printf ("odd size: %zu\n", size); - } - - void ---- a/freehdl/kernel-dump.hh -+++ b/freehdl/kernel-dump.hh -@@ -42,9 +42,9 @@ - short wait_id; - // This function will return an appropriate table entry (if - // available) -- char *find_table(type_info_interface* type); -+ const char *find_table(type_info_interface* type); - //this variable is used by the read_type function -- char* translation_table; -+ const char* translation_table; - // This method is executed each time the signal value changes - bool execute(); - // Continue dumping the signal. -@@ -77,7 +77,7 @@ - extern list<signal_dump*> signal_dump_process_list; - - // Used to store the user_defined translation table types --extern map<string, char*, less<string> > mapping_translation_table; -+extern map<string, const char*, less<string> > mapping_translation_table; - - - /****************************************************** ---- a/freehdl/kernel-fhdl-stream.hh -+++ b/freehdl/kernel-fhdl-stream.hh -@@ -29,7 +31,7 @@ - str->flush(); - } - -- fhdl_ostream_t &operator<<(char *p); -+ fhdl_ostream_t &operator<<(const char *p); - fhdl_ostream_t &operator<<(const string &a); - fhdl_ostream_t &operator<<(const int i); - fhdl_ostream_t &operator<<(const unsigned int i); ---- a/freehdl/std-vhdl-types.hh -+++ b/freehdl/std-vhdl-types.hh -@@ -607,7 +618,7 @@ - // which caused the failure or NULL otherwise. - virtual const char *read(void *dest, const char *str) = 0; - // Prints the content of src into an string stream in VCD format -- virtual void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) = 0; -+ virtual void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) = 0; - // Prints value into binary stream. Note that only the raw data but - // no type info objects are written! The method returns the number - // of bytes written to the stream. -@@ -785,7 +796,7 @@ - bool assign(void *dest, const void *src); - void remove(void *src); - void print(buffer_stream &str, const void *src, int mode); -- void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure); -+ void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure); - const char *read(void *dest, const char *str); - - integer check(integer value) { -@@ -821,7 +832,7 @@ - bool assign(void *dest, const void *src); - void remove(void *src); - void print(buffer_stream &str, const void *src, int mode); -- void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) {}; -+ void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) {}; - const char *read(void *dest, const char *str); - }; - -@@ -849,7 +860,7 @@ - bool assign(void *dest, const void *src); - void remove(void *src); - void print(buffer_stream &str, const void *src, int mode) {}; -- void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) {}; -+ void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) {}; - const char *read(void *dest, const char *str); - }; - -@@ -879,7 +890,7 @@ - bool assign(void *dest, const void *src); - void remove(void *src); - void print(buffer_stream &str, const void *src, int mode); -- void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure); -+ void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure); - const char *read(void *dest, const char *str); - - floatingpoint check(floatingpoint value) { -@@ -914,7 +925,7 @@ - bool assign(void *dest, const void *src); - void remove(void *src); - void print(buffer_stream &str, const void *src, int mode); -- void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure); -+ void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure); - const char *read(void *dest, const char *str); - - enumeration check(integer value) { -@@ -954,7 +965,7 @@ - bool assign(void *dest, const void *src); - void remove(void *src); - void print(buffer_stream &str, const void *src, int mode); -- void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) ; -+ void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) ; - const char *read(void *dest, const char *str); - - physical check(physical value) { -@@ -1087,7 +1098,7 @@ - bool assign(void *dest, const void *src) { return false; }; - void remove(void *src); - void print(buffer_stream &str, const void *src, int mode); -- void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) ; -+ void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) ; - const char *read(void *dest, const char *str); - }; - -@@ -1230,7 +1241,7 @@ - bool assign(void *dest, const void *src) { return false; }; - void remove(void *src); - void print(buffer_stream &str, const void *src, int mode); -- void vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure); -+ void vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure); - const char *read(void *dest, const char *str); - }; - ---- a/freehdl/vaul-lexer.h -+++ b/freehdl/vaul-lexer.h -@@ -115,7 +114,7 @@ - IR_String expand_bitstring(const char *, int len); - - int LexerInput(char *buf, int max_size); -- void LexerError(char *msg); -+ void LexerError(const char *msg); - void message(char *fmt, va_list ap); - void message(vaul_yyltype &loc, char *fmt, va_list ap); - ---- a/kernel/driver_info.cc -+++ b/kernel/driver_info.cc -@@ -270,6 +270,7 @@ - - - // Creates transaction composite signals. Returns number of assigned scalars. -+inline int do_record_transport_assignment(driver_info &, const record_base &, int, const vtime &); - inline int - do_array_transport_assignment(driver_info &driver, const array_base &value, int first, const vtime &tr_time) - { -@@ -311,7 +312,6 @@ - assigned_scalars += do_array_transport_assignment(driver, (array_base&)value.data[j], i, tr_time); - break; - case RECORD: -- inline int do_record_transport_assignment(driver_info &, const record_base &, int, const vtime &); - assigned_scalars += do_record_transport_assignment(driver, (record_base&)value.data[j], i, tr_time); - break; - } -@@ -339,6 +339,7 @@ - - - // Creates transaction for composite signals. Returns number of assigned scalars. -+inline int do_record_inertial_assignment(driver_info &, const record_base &, int, const vtime &, const vtime &); - inline int - do_array_inertial_assignment(driver_info &driver, - const array_base &value, int first, -@@ -381,8 +382,6 @@ - assigned_scalars += do_array_inertial_assignment(driver, (array_base&)value.data[j], i, tr_time, rm_time); - break; - case RECORD: -- inline int do_record_inertial_assignment(driver_info &, const record_base &, int, -- const vtime &, const vtime &); - assigned_scalars += do_record_inertial_assignment(driver, (record_base&)value.data[j], i, tr_time, rm_time); - break; - } ---- a/kernel/dump.cc -+++ b/kernel/dump.cc -@@ -90,7 +90,7 @@ - - - // find_translation table --char * -+const char * - signal_dump::find_table(type_info_interface* type) - { - switch(type->id) ---- a/kernel/fhdl_stream.cc -+++ b/kernel/fhdl_stream.cc -@@ -60,7 +63,7 @@ - } - - fhdl_ostream_t & --fhdl_ostream_t::operator<<(char *p) -+fhdl_ostream_t::operator<<(const char *p) - { - if (!socket_connection) - *str << p; ---- a/std/vhdl_types.cc -+++ b/std/vhdl_types.cc -@@ -1013,7 +1016,7 @@ - } - - void --integer_info_base::vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) -+integer_info_base::vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) - { - integer op =*((integer*)src); - static char result[INTEGER_SIZE_LD + 1]; -@@ -1306,7 +1309,7 @@ - } - - void --float_info_base::vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) { -+float_info_base::vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) { - // should be definitly enough characters to hold a string - // representation of a double - static char rbuffer[8*sizeof(double)]; -@@ -1432,7 +1435,7 @@ - - - void --enum_info_base::vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) -+enum_info_base::vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) - { - if (translation_table != NULL) { - const char output = translation_table[*((enumeration*)src)]; -@@ -1583,7 +1586,7 @@ - } - - void --physical_info_base::vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) { -+physical_info_base::vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) { - str << *((physical*)src) << " " << units[0]; - } - -@@ -1778,7 +1781,7 @@ - } - - // Temporary VCD_Print function --void array_info::vcd_print(buffer_stream &str, const void *src,char* translation_table, bool pure) -+void array_info::vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) - { - //str.clean(); - int length = ((array_base*)src)->info->length; -@@ -2090,7 +2093,7 @@ - - - // Temporary VCD_Print function --void record_info::vcd_print(buffer_stream &str, const void *src, char* translation_table, bool pure) -+void record_info::vcd_print(buffer_stream &str, const void *src, const char* translation_table, bool pure) - { - record_base &record = *(record_base*)src; - record_info &rinfo = *record.info; ---- a/vaul/lexer.cc -+++ b/vaul/lexer.cc -@@ -2075,7 +2075,7 @@ - } - - void --vaul_lexer::LexerError (char *m) -+vaul_lexer::LexerError (const char *m) - { - if (prt) - prt->fprintf (log, "%?%s %C\n", this, m, this); diff --git a/sci-electronics/freehdl/freehdl-0.0.8.ebuild b/sci-electronics/freehdl/freehdl-0.0.8.ebuild deleted file mode 100644 index 9bb8acab3f66..000000000000 --- a/sci-electronics/freehdl/freehdl-0.0.8.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A free VHDL simulator" -SRC_URI="mirror://sourceforge/qucs/${P}.tar.gz" -HOMEPAGE="http://freehdl.seul.org/" -LICENSE="GPL-2" - -SLOT="0" -IUSE="" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND=">=dev-scheme/guile-2.0:*" -DEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-0.0.8-fix-c++14.patch" - "${FILESDIR}/${PN}-0.0.8-qa.patch" -) - -src_configure() { - econf --disable-static -} - -src_install() { - default - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} diff --git a/sci-electronics/freehdl/metadata.xml b/sci-electronics/freehdl/metadata.xml deleted file mode 100644 index 4b6dfed69f58..000000000000 --- a/sci-electronics/freehdl/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-electronics@gentoo.org</email> - <name>Gentoo Electronics Project</name> - </maintainer> - <longdescription> - Free, open source, GPL'ed VHDL simulator. The project goal is to develop a - VHDL simulator that : - * Has a graphical waveform viewer. - * Has a source level debugger. - * Is VHDL-93 compliant. - * Is of commercial quality. (on par with, say, V-System - it'll take us a - while to get there, but that should be our aim) - * Is freely distributable - both source and binaries - like Linux itself. - (Under the Gnu General Public License (GPL)). - * Works with Linux. If others want to port it to other platforms they may, - but it is not the goal of this project. - </longdescription> - <upstream> - <remote-id type="sourceforge">qucs</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest index d96da819aa9b..c6e0e183278a 100644 --- a/sci-electronics/fritzing/Manifest +++ b/sci-electronics/fritzing/Manifest @@ -1,2 +1,4 @@ DIST fritzing-0.9.4.tar.gz 11430102 BLAKE2B 20232b3c33308edcab188c61597f87d8a21d9b786eeab4e398c1add6e263562d1b0df95634850d5271decfa380d7b2b0c18c7f19f8b8544f330687e4cffa3700 SHA512 b148d8b93d2e452c975ca3acfd2ad5de4259f99da69c5890ebeea30730674526d480ee3830f61f6057e83b7720f07fce80ef3a74d4b718be691a92d656b755e0 +DIST fritzing-0.9.6.tar.gz 11521767 BLAKE2B 01c6ea87108b70161350b79c4878c288935c3f0a37464cf3c4e276a746edb2bbcb2c3b7bcf0b3a879232f5f79fd15b573f930b8cea96924b04b1e5b3ddade542 SHA512 d91fcf79760b9570513e8315bcb29fcd1d53684920e8563539669a0dedd164e35031e53da7ea2c12e95e564b3f95a05ce953082ffdfa54f4e4f99c50a4991a52 DIST fritzing-parts-0.9.4.tar.gz 17662003 BLAKE2B a67f4f1297793131d25e6b9c853e987fc0c5ecebd5f57b3675b7f9c4539f867ad18fc6e854c7a2bef1669e05dbc13dcc93df9b9befb8991ca64b2bc3e2a71b84 SHA512 f6f6c396eaf0b61dd56ece22f6bb8fce4369503729fd8f5550643e74a60aaad75abce9e391d63d52f12e4f3420296791fdf9832f7c8507dad2cf623e1bd8340f +DIST fritzing-parts-0.9.6.tar.gz 14982269 BLAKE2B 0f017a2a3eb654ed26d647faa463024c52aab58df7a487c75e1636efb288dc9fad9aa8499404f381012287e6e3312a569ed2f171d20b2d5df85440d97673fe9c SHA512 d39096bcb89e2aa04c285aaddd575a54a08d016d859399133eab89d69ed37d5e5e5a5a9e838cad5879835bcdcdd9c3b484179104e04d8f96d4eef1004047162b diff --git a/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch b/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch new file mode 100644 index 000000000000..e7e9d6d27ac5 --- /dev/null +++ b/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch @@ -0,0 +1,25 @@ +https://github.com/fritzing/fritzing-app/pull/4033 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Fri, 16 Jun 2023 06:29:28 +0000 +Subject: [PATCH] clipablewire.cpp: Dropping usage of register storage class + +The register storage class has been depreacted in C++14 and completely +removed in C++17. Thus resulting in buils errors such as: + +clipablewire.cpp:55:2: error: ISO C++17 does not allow register storage class specifier [-Wregister] + +Refer: https://en.cppreference.com/w/cpp/language/storage_duration +Bug: https://bugs.gentoo.org/898070 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/src/items/clipablewire.cpp ++++ b/src/items/clipablewire.cpp +@@ -50,7 +50,7 @@ static double connectorRectClipInset = 0.5; + int CrossingsTest( double pgon[][2], int numverts, double point[2] ) + { + #ifdef WINDING +- register int crossings ; ++ int crossings ; + #endif + int j, yflag0, yflag1, inside_flag, xflag0 ; + double ty, tx, *vtx0, *vtx1 ; + diff --git a/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch b/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch new file mode 100644 index 000000000000..9d3853c516ab --- /dev/null +++ b/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch @@ -0,0 +1,28 @@ +Fix build with QuaZip-1.0. + +--- a/phoenix.pro ++++ b/phoenix.pro +@@ -194,8 +194,9 @@ + include(test/version.pri) + + contains(DEFINES, QUAZIP_INSTALLED) { + !build_pass:message("using installed QuaZIP library") +- LIBS += -lquazip5 ++ CONFIG += link_pkgconfig ++ PKGCONFIG += quazip1-qt5 + } else { + include(pri/quazip.pri) + } +--- a/src/utils/folderutils.cpp ++++ b/src/utils/folderutils.cpp +@@ -35,8 +35,8 @@ + + #include "../debugdialog.h" + #ifdef QUAZIP_INSTALLED +-#include <quazip5/quazip.h> +-#include <quazip5/quazipfile.h> ++#include <quazip.h> ++#include <quazipfile.h> + #else + #include "../lib/quazip/quazip.h" + #include "../lib/quazip/quazipfile.h" diff --git a/sci-electronics/fritzing/fritzing-0.9.6.ebuild b/sci-electronics/fritzing/fritzing-0.9.6.ebuild new file mode 100644 index 000000000000..4fb515cfa82f --- /dev/null +++ b/sci-electronics/fritzing/fritzing-0.9.6.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg + +PARTS_P="${PN}-parts-${PV}" +PARTS_COMMIT="667a5360e53e8951e5ca6c952ae928f7077a9d5e" + +DESCRIPTION="Electronic Design Automation" +HOMEPAGE=" + https://fritzing.org/ + https://github.com/fritzing/fritzing-app/ +" +SRC_URI=" + https://github.com/fritzing/fritzing-app/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/fritzing/fritzing-parts/archive/${PARTS_COMMIT}.tar.gz -> ${PARTS_P}.tar.gz +" +S="${WORKDIR}/${PN}-app-${PV}" + +LICENSE="CC-BY-SA-3.0 GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/quazip:0=[qt5(+)] + dev-libs/libgit2:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +DEPEND="${RDEPEND} + dev-libs/boost +" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.4-move-parts-db-path.patch" + "${FILESDIR}/${PN}-0.9.6-quazip-qt5.patch" + "${FILESDIR}/${PN}-0.9.6-dropping-register-keyword.patch" +) + +src_prepare() { + default + + # Get a rid of the bundled libs + # Bug 412555 and + # https://code.google.com/p/fritzing/issues/detail?id=1898 + rm -r src/lib/quazip/ pri/quazip.pri || die + + # Use system libgit + sed -i -e 's:LIBGIT_STATIC.*:LIBGIT_STATIC = false:' phoenix.pro || die + + # Add correct git version + sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${PV}:" pri/gitversion.pri || die +} + +src_configure() { + eqmake5 'DEFINES=QUAZIP_INSTALLED PARTS_COMMIT=\\\"'"${PARTS_COMMIT}"'\\\"' phoenix.pro +} + +src_install() { + PARTS_DIR="${WORKDIR}/fritzing-parts-${PARTS_COMMIT}" + INSTALL_ROOT="${D}" default + insinto /usr/share/fritzing/fritzing-parts + doins -r ${PARTS_DIR}/* + einstalldocs +} diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index b778335ec365..975f179885b5 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1 +1,2 @@ -DIST gazebo-11.12.0.tar.bz2 56542859 BLAKE2B f2da8371fa4655cc831401fcf6ceec8c82d507a93515762c078ac20a78cb4b739c9f373ef53bebc71b5d7e1c1cf4b98928b3e855fca6943a09da554ee19df1cb SHA512 8f60d432ab07084951bbe31c632f04f2fa11500441fb81fe27078a5cb5b67ba681889e1079844d44a5a30df562797d51683fd674942db9fd8c4d853e3e2c5d3e +DIST gazebo-11.13.0.tar.bz2 56636967 BLAKE2B 7c0ef875711e832a213631d97584edc2300d25be6d538d6f2ac782ab279b6518e1fb7c59d895a1c7b92fbaec46bb0e7c505afb34f05ab2eece016f5bd15a7c3f SHA512 a77ce4a02f723c615738d11a13aa10fa5124705bc9ca95153477d8df25b296eef7d442769379d3888a9ba0f04c1e5a3e38d686e7b5eef393b91bdc78f792c390 +DIST gazebo-11.14.0.tar.bz2 56640328 BLAKE2B 9712118339593edd6c3cc1321ffa3d60f9f986abecc858d0709a0ddd1600a00620b26141300083dcfbc8ff699ae01a21340190cda04b276d146e93ccd1bfc6dc SHA512 365bda1be67745b6b40834a059f220351559e962df5f7254c80d363a04cc4beb092d20eaa357469d87f64c00fd3c6b2480693d7b1d734b0b42a75eb0ba687e34 diff --git a/sci-electronics/gazebo/files/boost.patch b/sci-electronics/gazebo/files/boost.patch new file mode 100644 index 000000000000..56f26387c58c --- /dev/null +++ b/sci-electronics/gazebo/files/boost.patch @@ -0,0 +1,49 @@ +From 6b4d0f0b94cb2d98e6a48970c1c128e9b4f13e47 Mon Sep 17 00:00:00 2001 +From: Steve Peters <scpeters@openrobotics.org> +Date: Fri, 10 May 2024 15:39:02 +0200 +Subject: [PATCH 1/2] Fix build with boost 1.85.0 + +Signed-off-by: Steve Peters <scpeters@openrobotics.org> +--- + gazebo/common/Console.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gazebo/common/Console.cc b/gazebo/common/Console.cc +index 6b86bc2d02..bb4dbe3180 100644 +--- a/gazebo/common/Console.cc ++++ b/gazebo/common/Console.cc +@@ -221,7 +221,7 @@ void FileLogger::Init(const std::string &_prefix, const std::string &_filename) + if (boost::filesystem::is_directory(logPath)) + this->logDirectory = logPath.string(); + else +- this->logDirectory = logPath.branch_path().string(); ++ this->logDirectory = logPath.parent_path().string(); + } + + ///////////////////////////////////////////////// + +From 27c2277a2376f9d82755e975ae8b564d9d6ca6ed Mon Sep 17 00:00:00 2001 +From: Steve Peters <scpeters@openrobotics.org> +Date: Fri, 10 May 2024 17:43:32 +0200 +Subject: [PATCH 2/2] Fix build error in LogPlay.cc as well + +Signed-off-by: Steve Peters <scpeters@openrobotics.org> +--- + gazebo/util/LogPlay.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc +index 70cfcc3346..be00820edb 100644 +--- a/gazebo/util/LogPlay.cc ++++ b/gazebo/util/LogPlay.cc +@@ -414,8 +414,8 @@ common::Time LogPlay::LogEndTime() const + ///////////////////////////////////////////////// + std::string LogPlay::Filename() const + { +- return boost::filesystem::basename(this->dataPtr->filename) + +- boost::filesystem::extension(this->dataPtr->filename); ++ boost::filesystem::path path(this->dataPtr->filename); ++ return path.stem().string() + path.extension().string(); + } + + ///////////////////////////////////////////////// diff --git a/sci-electronics/gazebo/files/gv10.patch b/sci-electronics/gazebo/files/gv10.patch new file mode 100644 index 000000000000..f3ab5eb1e686 --- /dev/null +++ b/sci-electronics/gazebo/files/gv10.patch @@ -0,0 +1,45 @@ +From 660ae15f4af1f5ea8d9d50d4a24e4d91a94f9c2d Mon Sep 17 00:00:00 2001 +From: Steve Peters <scpeters@openrobotics.org> +Date: Tue, 20 Feb 2024 17:25:23 -0800 +Subject: [PATCH] Fix build with graphviz 10.0 + +Replace TRUE with 1, since the TRUE macro has been removed. + +Signed-off-by: Steve Peters <scpeters@openrobotics.org> +--- + gazebo/gui/qgv/QGVSubGraph.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gazebo/gui/qgv/QGVSubGraph.cpp b/gazebo/gui/qgv/QGVSubGraph.cpp +index 51925aba30..c16b69d065 100644 +--- a/gazebo/gui/qgv/QGVSubGraph.cpp ++++ b/gazebo/gui/qgv/QGVSubGraph.cpp +@@ -44,13 +44,13 @@ QString QGVSubGraph::name() const + + QGVNode *QGVSubGraph::addNode(const QString &label) + { +- Agnode_t *node = agnode(_sgraph->graph(), NULL, TRUE); ++ Agnode_t *node = agnode(_sgraph->graph(), NULL, 1); + if (node == NULL) + { + qWarning()<<"Invalid sub node :"<<label; + return 0; + } +- agsubnode(_sgraph->graph(), node, TRUE); ++ agsubnode(_sgraph->graph(), node, 1); + + QGVNode *item = new QGVNode(new QGVNodePrivate(node), _scene); + item->setLabel(label); +@@ -66,10 +66,10 @@ QGVSubGraph *QGVSubGraph::addSubGraph(const QString &_name, bool cluster) + if (cluster) + { + sgraph = agsubg(_sgraph->graph(), +- ("cluster_" + _name).toLocal8Bit().data(), TRUE); ++ ("cluster_" + _name).toLocal8Bit().data(), 1); + } + else +- sgraph = agsubg(_sgraph->graph(), _name.toLocal8Bit().data(), TRUE); ++ sgraph = agsubg(_sgraph->graph(), _name.toLocal8Bit().data(), 1); + + if (sgraph == NULL) + { diff --git a/sci-electronics/gazebo/files/protobuf.patch b/sci-electronics/gazebo/files/protobuf.patch new file mode 100644 index 000000000000..c815d7a9aab3 --- /dev/null +++ b/sci-electronics/gazebo/files/protobuf.patch @@ -0,0 +1,226 @@ +From 92a44c60e4b38d147fd92ed480e33e61cc68c928 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro <silvio@traversaro.it> +Date: Tue, 6 Jun 2023 13:50:07 +0200 +Subject: [PATCH 1/6] Support for protobuf >= 22 by using find_package(Protobuf + CONFIG) + +--- + cmake/SearchForStuff.cmake | 49 +++++++++++++++++++++++++----------- + cmake/gazebo-config.cmake.in | 15 ++++++++--- + 2 files changed, 46 insertions(+), 18 deletions(-) + +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index b1cb3f37b3..e0fbd68274 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -25,29 +25,48 @@ if (CMAKE_BUILD_TYPE) + endif() + + ######################################## +-if (PROTOBUF_VERSION LESS 2.3.0) ++if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0) + BUILD_ERROR("Incorrect version: Gazebo requires protobuf version 2.3.0 or greater") + endif() + + ######################################## + # The Google Protobuf library for message generation + serialization +-find_package(Protobuf REQUIRED) +-if (NOT PROTOBUF_FOUND) +- BUILD_ERROR ("Missing: Google Protobuf (libprotobuf-dev)") +-endif() +-if (NOT PROTOBUF_PROTOC_EXECUTABLE) +- BUILD_ERROR ("Missing: Google Protobuf Compiler (protobuf-compiler)") +-endif() +-if (NOT PROTOBUF_PROTOC_LIBRARY) +- BUILD_ERROR ("Missing: Google Protobuf Compiler Library (libprotoc-dev)") ++ ++# Protobuf >= 22 requires to link abseil, so we are constrained to use ++# find_package(Protobuf) and link to protobuf::libprotobuf, ++# see https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/4075#issuecomment-1569242816 ++if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0) ++ set(GZ_PROTOBUF_USE_CMAKE_CONFIG_DEFAULT ON) ++else() ++ set(GZ_PROTOBUF_USE_CMAKE_CONFIG_DEFAULT OFF) + endif() ++option(GZ_PROTOBUF_USE_CMAKE_CONFIG "If true use protobuf-config.cmake to find protobuf" ${GZ_PROTOBUF_USE_CMAKE_CONFIG_DEFAULT}) ++mark_as_advanced(GZ_PROTOBUF_USE_CMAKE_CONFIG) + +-if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") +- set (GZ_PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY_DEBUG}) +- set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY_DEBUG}) ++if(NOT GZ_PROTOBUF_USE_CMAKE_CONFIG) ++ find_package(Protobuf REQUIRED) ++ if (NOT PROTOBUF_FOUND) ++ BUILD_ERROR ("Missing: Google Protobuf (libprotobuf-dev)") ++ endif() ++ if (NOT PROTOBUF_PROTOC_EXECUTABLE) ++ BUILD_ERROR ("Missing: Google Protobuf Compiler (protobuf-compiler)") ++ endif() ++ if (NOT PROTOBUF_PROTOC_LIBRARY) ++ BUILD_ERROR ("Missing: Google Protobuf Compiler Library (libprotoc-dev)") ++ endif() ++ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") ++ set (GZ_PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY_DEBUG}) ++ set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY_DEBUG}) ++ else() ++ set (GZ_PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY}) ++ set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY}) ++ endif() + else() +- set (GZ_PROTOBUF_LIBRARY ${PROTOBUF_LIBRARY}) +- set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY}) ++ set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf) ++ set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc) ++ if(NOT DEFINED PROTOBUF_PROTOC_LIBRARY) ++ get_target_property(PROTOBUF_PROTOC_LIBRARY protobuf::protoc LOCATION) ++ endif() + endif() + + ######################################## +diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in +index 96993f93fa..ac1de2c061 100644 +--- a/cmake/gazebo-config.cmake.in ++++ b/cmake/gazebo-config.cmake.in +@@ -166,9 +166,18 @@ list(APPEND @PKG_NAME@_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}) + list(APPEND @PKG_NAME@_LIBRARIES ${Boost_LIBRARIES}) + + # Find protobuf +-find_package(Protobuf REQUIRED) +-list(APPEND @PKG_NAME@_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS}) +-list(APPEND @PKG_NAME@_LIBRARIES ${PROTOBUF_LIBRARIES}) ++set(GZ_PROTOBUF_USE_CMAKE_CONFIG @GZ_PROTOBUF_USE_CMAKE_CONFIG@) ++ ++if(NOT GZ_PROTOBUF_USE_CMAKE_CONFIG) ++ find_package(Protobuf REQUIRED) ++ list(APPEND @PKG_NAME@_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS}) ++ list(APPEND @PKG_NAME@_LIBRARIES ${PROTOBUF_LIBRARIES}) ++else() ++ find_package(Protobuf CONFIG REQUIRED) ++ list(APPEND @PKG_NAME@_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS}) ++ list(APPEND @PKG_NAME@_LIBRARIES protobuf::libprotoc) ++ list(APPEND @PKG_NAME@_LIBRARIES protobuf::libprotobuf) ++endif() + + # Find SDFormat + find_package(sdformat9 REQUIRED VERSION 9.8) + +From 83f05b7778ff2933d8bd3b9149207dd17a20b9b4 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro <silvio@traversaro.it> +Date: Tue, 6 Jun 2023 14:18:48 +0200 +Subject: [PATCH 2/6] Update SearchForStuff.cmake + +--- + cmake/SearchForStuff.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index e0fbd68274..d25b7a4a63 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -25,7 +25,7 @@ if (CMAKE_BUILD_TYPE) + endif() + + ######################################## +-if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0) ++if (PROTOBUF_VERSION LESS 2.3.0) + BUILD_ERROR("Incorrect version: Gazebo requires protobuf version 2.3.0 or greater") + endif() + + +From 398e832301429b2f406a5a0e35187ca8fabd50ad Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro <silvio@traversaro.it> +Date: Tue, 6 Jun 2023 23:25:06 +0200 +Subject: [PATCH 3/6] Update SearchForStuff.cmake + +--- + cmake/SearchForStuff.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index d25b7a4a63..2f0b53358f 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -62,6 +62,7 @@ if(NOT GZ_PROTOBUF_USE_CMAKE_CONFIG) + set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY}) + endif() + else() ++ find_package(Protobuf CONFIG REQUIRED) + set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf) + set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc) + if(NOT DEFINED PROTOBUF_PROTOC_LIBRARY) + +From d46bf2353a25b38b9613b67f2567f729e133d2b7 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro <silvio@traversaro.it> +Date: Tue, 6 Jun 2023 23:55:22 +0200 +Subject: [PATCH 4/6] Update SearchForStuff.cmake + +--- + cmake/SearchForStuff.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 2f0b53358f..1bbadd3c29 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -66,7 +66,9 @@ else() + set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf) + set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc) + if(NOT DEFINED PROTOBUF_PROTOC_LIBRARY) +- get_target_property(PROTOBUF_PROTOC_LIBRARY protobuf::protoc LOCATION) ++ get_target_property(PROTOBUF_PROTOC_LIBRARY_VAR protobuf::protoc LOCATION) ++ set(PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY_VAR} CACHE STRING "") ++ mark_as_advanced(PROTOBUF_PROTOC_LIBRARY) + endif() + endif() + + +From f372ef83b99bf2dc2f4a456ab74c7831c347ec89 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro <silvio@traversaro.it> +Date: Wed, 7 Jun 2023 00:39:40 +0200 +Subject: [PATCH 5/6] Update SearchForStuff.cmake + +--- + cmake/SearchForStuff.cmake | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 1bbadd3c29..c400bee0e3 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -65,10 +65,8 @@ else() + find_package(Protobuf CONFIG REQUIRED) + set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf) + set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc) +- if(NOT DEFINED PROTOBUF_PROTOC_LIBRARY) +- get_target_property(PROTOBUF_PROTOC_LIBRARY_VAR protobuf::protoc LOCATION) +- set(PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY_VAR} CACHE STRING "") +- mark_as_advanced(PROTOBUF_PROTOC_LIBRARY) ++ if(NOT DEFINED PROTOBUF_PROTOC_EXECUTABLE) ++ get_target_property(PROTOBUF_PROTOC_EXECUTABLE protobuf::protoc LOCATION) + endif() + endif() + + +From c4674eee1ad234d4a74bafc1d3ec401b595d3d63 Mon Sep 17 00:00:00 2001 +From: Steve Peters <computersthatmove@gmail.com> +Date: Wed, 14 Jun 2023 09:27:16 -0700 +Subject: [PATCH 6/6] Fix whitespace + +Signed-off-by: Steve Peters <scpeters@openrobotics.org> +--- + cmake/SearchForStuff.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index c400bee0e3..948cf0a8a1 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -32,7 +32,7 @@ endif() + ######################################## + # The Google Protobuf library for message generation + serialization + +-# Protobuf >= 22 requires to link abseil, so we are constrained to use ++# Protobuf >= 22 requires to link abseil, so we are constrained to use + # find_package(Protobuf) and link to protobuf::libprotobuf, + # see https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/4075#issuecomment-1569242816 + if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0) diff --git a/sci-electronics/gazebo/gazebo-11.12.0.ebuild b/sci-electronics/gazebo/gazebo-11.13.0.ebuild index 79c54a12daca..801fdd8a98a1 100644 --- a/sci-electronics/gazebo/gazebo-11.12.0.ebuild +++ b/sci-electronics/gazebo/gazebo-11.13.0.ebuild @@ -57,7 +57,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/libxslt ) " BDEPEND=" - || ( app-text/ronn-ng app-text/ronn ) + app-text/ronn-ng app-arch/gzip virtual/pkgconfig " @@ -65,6 +65,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo PATCHES=( "${FILESDIR}/qwt2.patch" "${FILESDIR}/cmake.patch" + "${FILESDIR}/protobuf.patch" ) src_configure() { diff --git a/sci-electronics/gazebo/gazebo-11.14.0.ebuild b/sci-electronics/gazebo/gazebo-11.14.0.ebuild new file mode 100644 index 000000000000..04caee69b302 --- /dev/null +++ b/sci-electronics/gazebo/gazebo-11.14.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A 3D multiple robot simulator with dynamics" +HOMEPAGE="https://gazebosim.org/home" +SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" + +LICENSE="Apache-2.0" +# Subslot = major version = soname of libs +SLOT="0/11" +KEYWORDS="~amd64" +IUSE="cpu_flags_x86_sse2 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/protobuf-2:= + virtual/opengl + media-libs/openal + net-misc/curl + dev-libs/tinyxml + >=dev-libs/tinyxml2-6:= + dev-libs/libtar + dev-cpp/tbb:= + >=dev-games/ogre-1.7.4:=[freeimage] + <dev-games/ogre-1.10 + >=media-libs/freeimage-3.15.4[png] + sci-libs/libccd + >=media-video/ffmpeg-2.6:0= + sci-libs/gts + >=sci-physics/bullet-2.82:= + >=dev-libs/sdformat-9.8:= + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-libs/boost:= + sci-libs/gdal:= + virtual/libusb:1 + dev-libs/libspnav + media-libs/freeimage + sci-libs/hdf5:=[cxx] + sys-apps/util-linux + >=media-gfx/graphviz-4 + net-libs/ignition-msgs:5= + sci-libs/ignition-math:6= + net-libs/ignition-transport:8= + sci-libs/ignition-common:3= + sci-libs/ignition-fuel-tools:4= + x11-libs/qwt:6=[qt5(+)] +" +DEPEND="${RDEPEND} + dev-qt/qttest:5 + x11-apps/mesa-progs + test? ( dev-libs/libxslt ) +" +BDEPEND=" + app-text/ronn-ng + app-arch/gzip + virtual/pkgconfig +" +CMAKE_BUILD_TYPE=RelWithDebInfo +PATCHES=( + "${FILESDIR}/qwt2.patch" + "${FILESDIR}/cmake.patch" + "${FILESDIR}/gv10.patch" + "${FILESDIR}/boost.patch" +) + +src_configure() { + # find OGRE properly + sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die + + local mycmakeargs=( + "-DUSE_UPSTREAM_CFLAGS=OFF" + "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" + "-DUSE_HOST_CFLAGS=FALSE" + "-DBUILD_TESTING=$(usex test TRUE FALSE)" + "-DENABLE_SCREEN_TESTS=FALSE" + "-DUSE_EXTERNAL_TINYXML2=TRUE" + ) + cmake_src_configure +} diff --git a/sci-electronics/geda-suite/geda-suite-20171223-r1.ebuild b/sci-electronics/geda-suite/geda-suite-20171223-r2.ebuild index 2037f821735f..760f14c4017e 100644 --- a/sci-electronics/geda-suite/geda-suite-20171223-r1.ebuild +++ b/sci-electronics/geda-suite/geda-suite-20171223-r2.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 HOMEPAGE="http://www.geda.seul.org" DESCRIPTION="Metapackage for all components for a full-featured gEDA/gaf system" -IUSE='' LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" SLOT="0" -RDEPEND="sci-electronics/geda +RDEPEND=" + sci-electronics/geda sci-electronics/gerbv >=sci-electronics/gnucap-0.35.20091207 >=sci-electronics/gwave-20090213-r1 @@ -20,4 +20,5 @@ RDEPEND="sci-electronics/geda sci-electronics/ngspice sci-electronics/gspiceui >=sci-electronics/gnetman-0.0.1_pre20110124 - sci-electronics/gtkwave" + sci-electronics/gtkwave +" diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest index 4639d6ec8227..c84543cdf7b2 100644 --- a/sci-electronics/geda/Manifest +++ b/sci-electronics/geda/Manifest @@ -1,2 +1 @@ DIST geda-gaf-1.10.2.tar.gz 14441491 BLAKE2B d6ecc4bc1390ff457396ae406fdeee909418f63d8c50e537215fa0a1131cfda91339f44ddc2c91ca0f3772f4416be1c4448fea45336c78bb601fb9b4df399b14 SHA512 c7beabf019762d9d3b4faa63f1345fb064ebbb6e0203a6c5bcab6b740d20db9f3cedf85c2f99e3ab1cb5396c06886fad1dbd5201eb7bad9e77c03511cf23b1a1 -DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3 diff --git a/sci-electronics/geda/files/geda-1.9.2-fno-common.patch b/sci-electronics/geda/files/geda-1.9.2-fno-common.patch deleted file mode 100644 index c509b42904a8..000000000000 --- a/sci-electronics/geda/files/geda-1.9.2-fno-common.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- a/gschem/include/globals.h -+++ b/gschem/include/globals.h -@@ -27,7 +27,7 @@ - extern GList *global_window_list; - - /* Manager for recently used files */ --GtkRecentManager *recent_manager; -+extern GtkRecentManager *recent_manager; - - /* colors */ - extern GdkColor white; ---- a/gschem/src/globals.c -+++ b/gschem/src/globals.c -@@ -28,6 +28,8 @@ - /* window list */ - GList *global_window_list = NULL; - -+GtkRecentManager *recent_manager = NULL; -+ - char *rc_filename = NULL; - char *output_filename = NULL; - ---- a/gattrib/include/globals.h -+++ b/gattrib/include/globals.h -@@ -88,7 +88,7 @@ - * structs.h - */ - /*------------------------------------------------------------------*/ --TOPLEVEL *pr_current; -+extern TOPLEVEL *pr_current; - - /*------------------------------------------------------------------*/ - /*! -@@ -97,7 +97,7 @@ TOPLEVEL *pr_current; - * callbacks. It is defined in structs.h - */ - /*------------------------------------------------------------------*/ --SHEET_DATA *sheet_head; -+extern SHEET_DATA *sheet_head; - - /*------------------------------------------------------------------ - * GTKsheet includes: stuff for dealing with windows. -@@ -106,18 +106,18 @@ SHEET_DATA *sheet_head; - #define DEFAULT_SPACE 8 - #define NUM_SHEETS 3 /* Components, Nets, and Pins */ - --GtkWidget *window; /* Main window */ --GtkWidget *notebook; -+extern GtkWidget *window; /* Main window */ -+extern GtkWidget *notebook; - --GtkSheet **sheets; /* These are the spreadsheet widgets themselves */ -+extern GtkSheet **sheets; /* These are the spreadsheet widgets themselves */ - --GtkWidget **scrolled_windows; --GtkWidget *entry; --GtkWidget *location; --GtkWidget *left_button; --GtkWidget *center_button; --GtkWidget *right_button; --GtkWidget *label; -+extern GtkWidget **scrolled_windows; -+extern GtkWidget *entry; -+extern GtkWidget *location; -+extern GtkWidget *left_button; -+extern GtkWidget *center_button; -+extern GtkWidget *right_button; -+extern GtkWidget *label; - - /* command line switch settings */ - extern int verbose_mode; ---- a/gattrib/src/globals.c -+++ b/gattrib/src/globals.c -@@ -34,6 +34,23 @@ - #include "../include/prototype.h" /* function prototypes */ - #include "../include/globals.h" - -+TOPLEVEL *pr_current; -+ -+SHEET_DATA *sheet_head; -+ -+GtkWidget *window; -+GtkWidget *notebook; -+ -+GtkSheet **sheets; -+ -+GtkWidget **scrolled_windows; -+GtkWidget *entry; -+GtkWidget *location; -+GtkWidget *left_button; -+GtkWidget *center_button; -+GtkWidget *right_button; -+GtkWidget *label; -+ - /* command line arguments */ - int verbose_mode=FALSE; //!< Reflects the value of the command line flag - int quiet_mode=FALSE; //!< Reflects the value of the command line flag diff --git a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch deleted file mode 100644 index 631673367801..000000000000 --- a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- geda-gaf-1.9.2/m4/geda-guile.m4 -+++ geda-gaf-1.9.2/m4/geda-guile.m4 -@@ -35,8 +35,13 @@ - GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'` - - _found_pkg_config_guile=yes -+ PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER], -+ [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no]) -+ -+ if test "${_found_pkg_config_guile}" = "no" ; then - PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER], - [GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no]) -+ fi - - if test "${_found_pkg_config_guile}" = "no" ; then - PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER], diff --git a/sci-electronics/geda/geda-1.10.2-r1.ebuild b/sci-electronics/geda/geda-1.10.2-r1.ebuild deleted file mode 100644 index 314a941f9a7f..000000000000 --- a/sci-electronics/geda/geda-1.10.2-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_BUILDER="doxygen" -DOCS_DEPEND=" - media-gfx/graphviz - media-gfx/imagemagick - virtual/latex-base -" -inherit autotools docs xdg - -MY_PN=${PN}-gaf -MY_P=${MY_PN}-${PV} - -DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package" -HOMEPAGE="http://wiki.geda-project.org/geda:gaf" -SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug examples fam nls" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-libs/glib:2 - dev-scheme/guile - sci-electronics/electronics-menu - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/pango - nls? ( virtual/libintl ) - fam? ( app-admin/gamin ) -" - -DEPEND="${RDEPEND} - dev-util/desktop-file-utils - x11-misc/shared-mime-info" -BDEPEND=" - sys-apps/groff - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -# Xorn requires python2 -PATCHES=( - "${FILESDIR}/${P}-drop-xorn.patch" -) - -src_prepare() { - default - rm -r xorn || die - - if ! use doc ; then - sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die - fi - if ! use examples ; then - sed -i -e 's/\texamples$//' Makefile.in || die - fi - - # add missing GIO_LIB Bug #684870 - sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \ - gsymcheck/src/Makefile.am || die - - sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \ - gnetlist-legacy/src/Makefile.am || die - - sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \ - utils/gschlas/Makefile.am || die - - sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \ - contrib/sarlacc_schem/Makefile.am || die - - # remove compressed files, compressed by portage in install phase - rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die - rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die - rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die - - eautoreconf -} - -src_configure() { - local myconf=( - --disable-rpath - --disable-update-xdg-database - $(use_enable doc doxygen) - $(use_enable debug assert) - $(use_enable nls) - $(use_with fam libfam) - ) - - econf "${myconf[@]}" -} diff --git a/sci-electronics/geda/geda-1.10.2-r2.ebuild b/sci-electronics/geda/geda-1.10.2-r2.ebuild index a1e9c74fae8e..24b2e1b10dd4 100644 --- a/sci-electronics/geda/geda-1.10.2-r2.ebuild +++ b/sci-electronics/geda/geda-1.10.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,14 +15,14 @@ MY_PN=${PN}-gaf MY_P=${MY_PN}-${PV} DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package" -HOMEPAGE="http://wiki.geda-project.org/geda:gaf" +HOMEPAGE="http://geda-project.org/ http://wiki.geda-project.org/geda:gaf" SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug examples fam nls" +KEYWORDS="amd64 ~ppc ~x86" +IUSE="debug fam nls" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} @@ -57,31 +57,15 @@ src_prepare() { default rm -r xorn || die - if ! use doc ; then - sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die - fi - if ! use examples ; then - sed -i -e 's/\texamples$//' Makefile.in || die - fi - - # add missing GIO_LIB Bug #684870 - sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \ - gsymcheck/src/Makefile.am || die - - sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \ - gnetlist-legacy/src/Makefile.am || die - - sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \ - utils/gschlas/Makefile.am || die - - sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \ - contrib/sarlacc_schem/Makefile.am || die - # remove compressed files, compressed by portage in install phase rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die + # -Wmaybe-uninitialized is made fatal, which is not ideal for building + # releases. Upstream is working on fixing these anyway. + sed -i '/Werror_maybe_uninitialized_IF_SUPPORTED/d' configure.ac || die + eautoreconf } diff --git a/sci-electronics/geda/geda-1.9.2-r1.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild deleted file mode 100644 index e4657a2c3eeb..000000000000 --- a/sci-electronics/geda/geda-1.9.2-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg - -MY_PN=${PN}-gaf -MY_P=${MY_PN}-${PV} - -DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package" -HOMEPAGE="http://wiki.geda-project.org/geda:gaf" -SRC_URI="http://ftp.geda-project.org/${MY_PN}/unstable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc examples nls stroke threads" - -RDEPEND=" - dev-libs/glib:2 - dev-scheme/guile - sci-electronics/electronics-menu - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/pango - nls? ( virtual/libintl ) - stroke? ( dev-libs/libstroke )" - -DEPEND="${RDEPEND} - dev-util/desktop-file-utils - x11-misc/shared-mime-info" -BDEPEND=" - sys-apps/groff - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-guile-2.2.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_prepare() { - default - - if ! use doc ; then - sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die - fi - if ! use examples ; then - sed -i -e 's/\texamples$//' Makefile.in || die - fi - - # add missing GIO_LIB Bug #684870 - sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \ - gsymcheck/src/Makefile.am || die - - sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \ - gnetlist/src/Makefile.am || die - - sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \ - utils/gschlas/Makefile.am || die - - sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \ - contrib/sarlacc_schem/Makefile.am || die - - rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die - - eautoreconf -} - -src_configure() { - local myconf=( - --disable-doxygen - --disable-rpath - --disable-update-xdg-database - $(use_enable debug assert) - $(use_enable nls) - $(use_enable threads threads posix) - $(use_with stroke libstroke) - ) - - econf "${myconf[@]}" -} - -src_test() { - emake -j1 check -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-electronics/geda/metadata.xml b/sci-electronics/geda/metadata.xml index 41090aecc004..db3ca30f3bbe 100644 --- a/sci-electronics/geda/metadata.xml +++ b/sci-electronics/geda/metadata.xml @@ -18,7 +18,4 @@ The gEDA/gaf suite (this package) provides schematic capture, netlisting, bill of materials generation, and many other features. </longdescription> - <use> - <flag name="stroke">enable mouse gesture support</flag> - </use> </pkgmetadata> diff --git a/sci-electronics/gerbv/gerbv-2.7.0.ebuild b/sci-electronics/gerbv/gerbv-2.7.0.ebuild index 48219cd522a6..6178a2b00050 100644 --- a/sci-electronics/gerbv/gerbv-2.7.0.ebuild +++ b/sci-electronics/gerbv/gerbv-2.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit xdg DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer" HOMEPAGE="http://gerbv.geda-project.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="doc examples unit-mm" RESTRICT="test" diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest new file mode 100644 index 000000000000..496b50235c75 --- /dev/null +++ b/sci-electronics/ghdl/Manifest @@ -0,0 +1 @@ +DIST ghdl-4.1.0.tar.gz 7704716 BLAKE2B d69791d947ed11b62fac8e076c3b9e1bad606a0de57e8d5bd67c9a8f7ea0cad73643085efbaaa06fabdd5900366334b63385589da72f4db488f5b27b142a76f8 SHA512 0a3a465f7f8ed7fba9b81b5dec2903bf82731c97a127666e7644286c9ea80078354be4e6bf8947a6ef631b646dc7e8e69dce2d9a467ac36ee03c67d9335a2703 diff --git a/sci-electronics/ghdl/files/ghdl-4.0.0_pre20231218-no-pyunit.patch b/sci-electronics/ghdl/files/ghdl-4.0.0_pre20231218-no-pyunit.patch new file mode 100644 index 000000000000..91cb22d6035a --- /dev/null +++ b/sci-electronics/ghdl/files/ghdl-4.0.0_pre20231218-no-pyunit.patch @@ -0,0 +1,18 @@ +diff --git a/testsuite/testsuite.sh.orig b/testsuite/testsuite.sh +index 0c1049f..52da6db 100755 +--- a/testsuite/testsuite.sh.orig ++++ b/testsuite/testsuite.sh +@@ -130,9 +130,10 @@ do_test() { + pyunit) + # The Python Unit testsuite: regression testsuite for Python bindings to libghdl + # pyunit/dom fails with python 3.12 +- gstart "[GHDL - test] pyunit" +- PYTHONPATH=$(pwd)/.. ${PYTHON:-python3} -m pytest -vsrA pyunit/lsp pyunit/libghdl +- gend ++ # gstart "[GHDL - test] pyunit" ++ # PYTHONPATH=$(pwd)/.. ${PYTHON:-python3} -m pytest -vsrA pyunit/lsp pyunit/libghdl ++ # gend ++ echo "Python Unit testsuite is disabled!" + ;; + + vests) diff --git a/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild b/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild new file mode 100644 index 000000000000..ab07376f8f4f --- /dev/null +++ b/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ADA_COMPAT=( gnat_2021 gcc_13 ) +LLVM_COMPAT=( {16..17} ) # Check configure script for supported LLVM versions. + +inherit ada edo llvm-r1 toolchain-funcs + +DESCRIPTION="Open-source analyzer, compiler, and simulator for VHDL 2008/93/87" +HOMEPAGE="https://ghdl.github.io/ghdl/ + https://github.com/ghdl/ghdl/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/ghdl/${PN}.git" +else + SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="llvm +static-libs" + +# The LLVM backend requires static libraries to work, see bug: https://bugs.gentoo.org/938171 +REQUIRED_USE="${ADA_REQUIRED_USE} llvm? ( static-libs )" + +RDEPEND=" + ${ADA_DEPS} + llvm? ( + $(llvm_gen_dep ' + sys-devel/llvm:${LLVM_SLOT}= + ') + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-util/patchelf +" + +PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" ) + +pkg_setup() { + ada_pkg_setup + + use llvm && llvm-r1_pkg_setup +} + +src_prepare() { + default + + sed -i "s|ar rc|$(tc-getAR) rc|g" Makefile.in || die +} + +src_configure() { + tc-export CC CXX + + local -a myconf=( + # Build. + --disable-werror + + # Install location. + --libdir=$(get_libdir) + --prefix="/usr" + + # Features. + --enable-libghdl + --enable-synth + ) + + if use llvm ; then + myconf+=( + --with-llvm-config="llvm-config" + ) + fi + + # Not a autotools script! + edo sh ./configure "${myconf[@]}" +} + +src_compile() { + default + + patchelf --set-soname libghw.so lib/libghw.so || die +} + +src_install() { + default + + if ! use static-libs ; then + find "${ED}" -type f -name '*.a' -delete || die + fi +} diff --git a/sci-electronics/ghdl/ghdl-4.1.0.ebuild b/sci-electronics/ghdl/ghdl-4.1.0.ebuild new file mode 100644 index 000000000000..7fb1396f35c1 --- /dev/null +++ b/sci-electronics/ghdl/ghdl-4.1.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ADA_COMPAT=( gnat_2021 gcc_13 ) +LLVM_MAX_SLOT=17 # Check "configure" script for supported LLVM versions. + +inherit ada edo llvm toolchain-funcs + +DESCRIPTION="Open-source analyzer, compiler, and simulator for VHDL 2008/93/87" +HOMEPAGE="https://ghdl.github.io/ghdl/ + https://github.com/ghdl/ghdl/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/ghdl/${PN}.git" +else + SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" + + KEYWORDS="amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="llvm" +REQUIRED_USE="${ADA_REQUIRED_USE}" + +RDEPEND=" + ${ADA_DEPS} + llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-util/patchelf +" + +PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" ) + +pkg_setup() { + ada_pkg_setup + + use llvm && llvm_pkg_setup +} + +src_prepare() { + default + + sed -i "s|ar rc|$(tc-getAR) rc|g" Makefile.in || die +} + +src_configure() { + tc-export CC CXX + + local -a myconf=( + # Build. + --disable-werror + + # Install location. + --libdir=$(get_libdir) + --prefix=/usr + + # Features. + --enable-libghdl + --enable-synth + ) + + if use llvm ; then + myconf+=( --with-llvm-config=llvm-config ) + fi + + # Not a autotools script! + edo sh ./configure "${myconf[@]}" +} + +src_compile() { + default + + patchelf --set-soname libghw.so lib/libghw.so || die +} + +src_install() { + default + + find "${ED}" -type f -name '*.a' -delete || die +} diff --git a/sci-electronics/ghdl/metadata.xml b/sci-electronics/ghdl/metadata.xml new file mode 100644 index 000000000000..aa290daef91e --- /dev/null +++ b/sci-electronics/ghdl/metadata.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <longdescription> + GHDL is a shorthand for G Hardware Design Language (currently, G has no + meaning). It is a VHDL analyzer, compiler, simulator and (experimental) + synthesizer that can process (nearly) any VHDL design. Unlike some other + simulators, GHDL is a compiler: it directly translates a VHDL file to + machine code, without using an intermediary language such as C or C++. + Therefore, the compiled code should be faster and the analysis time should + be shorter than with a compiler using an intermediary language. GHDL can + use multiple back-ends, i.e. code generators, (GCC, LLVM or x86/i386 only, + a built-in one named mcode) and runs on GNU/Linux, Windows and macOS; on + x86, x86_64, armv6/armv7/aarch32/aarch64, ppc64, etc. GHDL aims at + implementing VHDL as defined by IEEE 1076. It supports the 1987, 1993 and + 2002 revisions and, partially, 2008 and 2019. Property Specification + Language (PSL) is also partially supported. + </longdescription> + <use> + <flag name="llvm">Build LLVM code generator</flag> + </use> + <upstream> + <bugs-to>https://github.com/ghdl/ghdl/issues/</bugs-to> + <remote-id type="github">ghdl/ghdl</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-electronics/gnucap/gnucap-20210107.ebuild b/sci-electronics/gnucap/gnucap-20210107.ebuild index f29ea8e434d1..9958fe58fcee 100644 --- a/sci-electronics/gnucap/gnucap-20210107.ebuild +++ b/sci-electronics/gnucap/gnucap-20210107.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnucap.org/" IUSE="examples" SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc ~x86" RDEPEND="sys-libs/readline:=" DEPEND="${RDEPEND}" diff --git a/sci-electronics/gsmc/files/gsmc-1.1-clang16-build-fix.patch b/sci-electronics/gsmc/files/gsmc-1.1-clang16-build-fix.patch new file mode 100644 index 000000000000..bc813a0bed20 --- /dev/null +++ b/sci-electronics/gsmc/files/gsmc-1.1-clang16-build-fix.patch @@ -0,0 +1,41 @@ +Bug: https://bugs.gentoo.org/886137 +--- a/autotune.c ++++ b/autotune.c +@@ -29,6 +29,8 @@ + #include <math.h> + #include "main.h" + #include "autotune.h" ++#include "draw.h" ++#include "calc.h" + #include <unistd.h> + + +--- a/main.h ++++ b/main.h +@@ -112,4 +112,6 @@ gint mdw_expose_event(GtkWidget *, GdkEventExpose *, gpointer), + + void writespice(char *); + void removene(void); ++void loadgw(char *); ++void savegw(char *); + +--- a/print.c ++++ b/print.c +@@ -32,6 +32,7 @@ + #include "main.h" + #include "calc.h" + #include "print.h" ++#include "draw.h" + // jvdh 2004-3-30 + + extern SMCDATA smcdata; +--- a/widget.c ++++ b/widget.c +@@ -36,6 +36,7 @@ + #include "widget.h" + #include "draw.h" + #include "print.h" ++#include "autotune.h" + + extern GtkTextBuffer *txtcircbuff; + extern int Zcirc, Ycirc, RHOcirc, Qcirc, tsidx, fsidx; diff --git a/sci-electronics/gsmc/gsmc-1.1-r3.ebuild b/sci-electronics/gsmc/gsmc-1.1-r3.ebuild new file mode 100644 index 000000000000..7abf1fbc2832 --- /dev/null +++ b/sci-electronics/gsmc/gsmc-1.1-r3.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="A GTK program for doing Smith Chart calculations" +HOMEPAGE="https://www.qsl.net/ik5nax/" +SRC_URI="https://www.qsl.net/ik5nax/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:2 +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-clang16-build-fix.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862456 + # + # Upstream software dates to 2004 with no sign of activity. + filter-lto + + default +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS NEWS README TODO + insinto /usr/share/${PN} + doins example* +} diff --git a/sci-electronics/gspeakers/gspeakers-0.11-r2.ebuild b/sci-electronics/gspeakers/gspeakers-0.11-r2.ebuild index 28ce47c011f6..35d1e4597f47 100644 --- a/sci-electronics/gspeakers/gspeakers-0.11-r2.ebuild +++ b/sci-electronics/gspeakers/gspeakers-0.11-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools flag-o-matic gnome2 DESCRIPTION="GTK based loudspeaker enclosure and crossovernetwork designer" HOMEPAGE="http://gspeakers.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest index 8e067dce86db..b15a5fcc43e7 100644 --- a/sci-electronics/gspiceui/Manifest +++ b/sci-electronics/gspiceui/Manifest @@ -1,2 +1,2 @@ -DIST gspiceui-v1.1.00.tar.gz 1048236 BLAKE2B cc3d14137517cd26687dabac7e001e7518fee91aedc74f1995ac763873345f2965c3edb4e037ecb6ac8ca874289b2e658fe3185d95b3eeaf2b349efab151f37b SHA512 46ccf3dd7a5dd9ec1cac1eb742187ecab15a6c0033467d52a44c916e239696faf7b8797e1a155191cf0ed37b04619b0666cff51e78912a06ecd2c63d377cba93 +DIST gspiceui-1.3.30_pre20240321.zip 80103549 BLAKE2B 5cdbd2338dd057d73a01572e75a7af145bca99f3e9339d259ae3615076e26a5c1614eecdd1e32cd669ecdd2a5cc1e3934dc3d3f1b36980c7a2eed7c6c15e1bb6 SHA512 736f7eafbaa26c3d9b3fa0df1ae5071adf21c0716519a99a0b9d199aa10a0dd402273de51d2e16b07be4c145ab2d34e133c515a8cfbb44068aa46cdc36a20658 DIST gspiceui-v1.2.87.tar.gz 1089733 BLAKE2B c1801bfebd5d42fe9c1ab26e6fd0cb06b56cac53bbad272522896325e5fd979e6fcc63d6f99262b152180f249b5b2d4aa119aa83254a2fc07256574c9ebaef10 SHA512 081d04c39f4fb96139f12fa063dfb888e036948a00a6b55de3b04a49b2b4af01b45fd9b7f903855d798a71957452550dfa8c8505c167c239e27ada29cb6fa747 diff --git a/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch b/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch deleted file mode 100644 index b6c3d36a544e..000000000000 --- a/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -69,13 +69,7 @@ - # -Ofast Optimize till it hurts : "-O3" + enable opts not valid for all standard-compliants - # -Os Optimize for size - # -Og Optimize debugging experience but don't break debugging --ifeq ($(GSPICEUI_DBG),0) -- # Options for release (not using -Wall since it's GCC specific) -- CXXFLAGS := -O1 -pipe $(shell $(WXCFG) --cxxflags) --else -- # Options for development -- CXXFLAGS := -g -Og -Wall -Wextra -pipe $(shell $(WXCFG) --cxxflags) --endif -+ CXXFLAGS += $(shell $(WXCFG) --cxxflags) - - # The following suppresses spurious warnings from gcc with wxWidgets v2.8.12 - ifeq ($(GSPICEUI_WXLIB),2.8) -@@ -134,7 +128,7 @@ - # -o specify the output file name - - $(BINDIR)/$(PROG) : $(OBJS) -- $(CXX) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS) -+ $(CXX) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS) - ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app)) - cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui - endif diff --git a/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch b/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch new file mode 100644 index 000000000000..531491829bd3 --- /dev/null +++ b/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch @@ -0,0 +1,50 @@ +--- a/src/Makefile.old 2024-06-21 11:25:45.990728109 +0200 ++++ b/src/Makefile 2024-06-21 11:33:20.289571247 +0200 +@@ -46,8 +46,8 @@ + #*************************************************************************************************** + + # Which compiler and linker (eg. g++ or clang++) +-CXX = g++ +-LD = g++ ++CXX ?= g++ ++LD ?= g++ + ifneq ($(GSPICEUI_MSWIN),0) + LD += -static-libstdc++ -static-libgcc + WINDRES = windres +@@ -108,17 +108,7 @@ + # -fabi-version=N Use version N of the C++ ABI (this choice must match the wxWidgets library) + + CXXFLAGS := -std=c++17 -fabi-version=14 +-ifeq ($(GSPICEUI_DEBUG),0) +- # Options for release (not using -Wall since it's GCC specific) +- CXXFLAGS += -O3 +-else +- # Options for development +- CXXFLAGS += -g3 -O0 -Wall -Wextra -Wpedantic +- +- # The following warning has been disabled because I don't know how to fix it +- CXXFLAGS += -Wno-overloaded-virtual +-endif +-CXXFLAGS += -pipe $(shell $(WXCFG) --cxxflags) ++CXXFLAGS += $(shell $(WXCFG) --cxxflags) + + # I like to compile using the option "-Wall" etc. however tests that break wxWidgets are turned off + ifneq ($(GSPICEUI_DEBUG),0) +@@ -231,7 +221,7 @@ + # -o specify the output file name + + $(BINDIR)/$(PROG) : $(OBJS) +- $(LD) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS) ++ $(CXX) -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS) + ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app)) + cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui + endif +@@ -296,7 +286,7 @@ + + # Compiler options + +-test_% : CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags) ++test_% : CXXFLAGS += $(shell $(WXCFG) --cxxflags) + test_% : CXXFLAGS += -D $(shell echo $@ | tr "[:lower:]" "[:upper:]") + # Libraries + test_% : LIBS = $(shell $(WXCFG) --libs core,base) diff --git a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild b/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild deleted file mode 100644 index 81c6e4c2d621..000000000000 --- a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0" -inherit desktop flag-o-matic toolchain-funcs wxwidgets - -MY_P="${PN}-v${PV}0" - -DESCRIPTION="GUI frontend for Ngspice and Gnucap" -HOMEPAGE="https://sourceforge.net/projects/gspiceui/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="examples schematics waveform" - -DEPEND=" - x11-libs/wxGTK:${WX_GTK_VER}[X] - sci-electronics/electronics-menu" -RDEPEND=" - ${DEPEND} - || ( - sci-electronics/ngspice - sci-electronics/gnucap - ) - waveform? ( sci-electronics/gwave ) - schematics? ( sci-electronics/geda )" - -PATCHES=( - # Use Gentoo LDFLAGS and CXXFLAGS - "${FILESDIR}"/${P}-flags.patch -) - -src_prepare() { - default - - # Adjusting the doc path at src/main/HelpTasks.cpp - sed -i -e \ - "s:/share/gspiceui/html/User-Manual.html:/share/doc/${PF}/html/User-Manual.html:g" \ - src/main/HelpTasks.cpp || die - - # Adjusting call to gwave program - sed -i -e "s/gwave2/gwave/g" src/TypeDefs.hpp || die -} - -src_configure() { - setup-wxwidgets - - # bug 553968 - replace-flags -O? -O1 - - default -} - -src_compile() { - emake CXX="$(tc-getCXX)" -} - -src_install() { - dobin bin/gspiceui - - HTML_DOCS=( html/*.html html/*.jpg html/*.png ) - einstalldocs - dodoc ChangeLog ReadMe ToDo release-notes-v1.1.00.txt - doman gspiceui.1 - - # installing examples and according model and symbol files - use examples && dodoc -r lib sch - - newicon src/icons/gspiceui-48x48.xpm gspiceui.xpm - make_desktop_entry gspiceui "GNU Spice GUI" gspiceui "Electronics" -} - -pkg_postinst() { - if use examples ; then - elog "If you want to use the examples, copy and extract from" - elog "${EROOT}/usr/share/doc/${PF} the sch and lib directory" - elog "side by side to your home directory to be able" - elog "to generate the netlists as normal user." - fi -} diff --git a/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild b/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild index d5377a288285..457548d8a92c 100644 --- a/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild +++ b/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,12 +10,12 @@ MY_P="${PN}-v${PV}" DESCRIPTION="GUI frontend for Ngspice and Gnucap" HOMEPAGE="https://sourceforge.net/projects/gspiceui/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="examples" DEPEND=" diff --git a/sci-electronics/gspiceui/gspiceui-1.3.30_pre20240321.ebuild b/sci-electronics/gspiceui/gspiceui-1.3.30_pre20240321.ebuild new file mode 100644 index 000000000000..9b8cb5aa5a98 --- /dev/null +++ b/sci-electronics/gspiceui/gspiceui-1.3.30_pre20240321.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +inherit desktop optfeature wxwidgets xdg + +DESCRIPTION="GUI frontend for Ngspice and Gnucap" +HOMEPAGE="https://sourceforge.net/projects/gspiceui/" +#SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" +MY_REV="382" +# SF source is temporal +#SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gs/${PN}/code/${PN}-code-r${MY_REV}-trunk.zip -> ${P}.zip" +SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-code-r${MY_REV}-trunk.zip -> ${P}.zip" +S="${WORKDIR}/${PN}-code-r${MY_REV}-trunk" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +DEPEND=" + x11-libs/wxGTK:${WX_GTK_VER}[X] + sci-electronics/electronics-menu +" +RDEPEND=" + ${DEPEND} + || ( + sci-electronics/ngspice + sci-electronics/gnucap + ) +" +BDEPEND="app-arch/unzip" + +PATCHES=( + # Use Gentoo LDFLAGS and CXXFLAGS + # https://sourceforge.net/p/gspiceui/bugs/30/ + "${FILESDIR}"/${P}-respect-users-flags.patch +) + +src_configure() { + setup-wxwidgets + default +} + +src_compile() { + export HOME="${T}" + mkdir -p "${T}/.config" + emake GSPICEUI_WXLIB=3.2 GSPICEUI_DEBUG=0 +} + +src_install() { + dobin bin/gspiceui + + einstalldocs + dodoc html/*.html html/*.jpg html/*.png + dodoc ChangeLog ReadMe ToDo + doman gspiceui.1 + + # installing examples and according model and symbol files + use examples && dodoc -r lib sch + + newicon -s 32 src/icons/gspiceui-32x32.xpm gspiceui.xpm + newicon -s 48 src/icons/gspiceui-48x48.xpm gspiceui.xpm + make_desktop_entry gspiceui "GNU Spice GUI" gspiceui "Electronics" +} + +pkg_postinst() { + xdg_pkg_postinst + if use examples ; then + elog "If you want to use the examples, copy and extract from" + elog "${EROOT}/usr/share/doc/${PF} the sch and lib directory" + elog "side by side to your home directory to be able" + elog "to generate the netlists as normal user." + fi + optfeature "schematics editing" sci-electronics/geda + optfeature "waveform display" sci-electronics/gwave +} diff --git a/sci-electronics/gspiceui/metadata.xml b/sci-electronics/gspiceui/metadata.xml index c0d060cb2ffc..b4f5b4f99af0 100644 --- a/sci-electronics/gspiceui/metadata.xml +++ b/sci-electronics/gspiceui/metadata.xml @@ -5,10 +5,6 @@ <email>sci-electronics@gentoo.org</email> <name>Gentoo Electronics Project</name> </maintainer> - <use> - <flag name="schematics">Use <pkg>sci-electronics/geda</pkg> for schematics editing</flag> - <flag name="waveform">Use <pkg>sci-electronics/gwave</pkg> for waveform display</flag> - </use> <upstream> <remote-id type="sourceforge">gspiceui</remote-id> </upstream> diff --git a/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild index 62fd0865a965..f9b8df0f1954 100644 --- a/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild +++ b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs xdg DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files" HOMEPAGE="http://gtkwave.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0" diff --git a/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild index 0784d1498ca3..637b98a1bdc6 100644 --- a/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild +++ b/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,11 +7,11 @@ inherit toolchain-funcs xdg DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files" HOMEPAGE="http://gtkwave.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-gtk3-${PV}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-gtk3-${PV}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples fasttree judy lzma packed tcl" RDEPEND=" diff --git a/sci-electronics/gwave/gwave-20190116.ebuild b/sci-electronics/gwave/gwave-20190116.ebuild index ff747645f0c4..6c3e20e41063 100644 --- a/sci-electronics/gwave/gwave-20190116.ebuild +++ b/sci-electronics/gwave/gwave-20190116.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,10 +7,10 @@ inherit autotools desktop xdg-utils DESCRIPTION="Analog waveform viewer for SPICE-like simulations" HOMEPAGE="http://gwave.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/gwave3/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/gwave3/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="gnuplot plotutils" SLOT="0" diff --git a/sci-electronics/irsim/Manifest b/sci-electronics/irsim/Manifest index 144ec603afab..9bbbd570fb56 100644 --- a/sci-electronics/irsim/Manifest +++ b/sci-electronics/irsim/Manifest @@ -1 +1,2 @@ +DIST irsim-9.7.93-patches.tar.xz 8736 BLAKE2B 3377e8d0c7f24227930ff233b9b17f19033b3e1506ab2f72634255ce00be98841921fe68b51201f8a399d4edb4d43de00ebbe31065b5e79ef462775affc12764 SHA512 c814428d1c71e8fc69f2b19d5e69886f54ae054134c07ad72e0187b04f1a99a0267aa3c33982a264d7132bd93057cffe0aa325bd211d551e39597d5737150989 DIST irsim-9.7.93.tgz 465721 BLAKE2B f40e1216f51a51a38ee52628532989ee307db1ff3b0daa4f047a1a3eb04bd49d903382f67c1c4bae4366147f4448eb9699cdc47cffe712fa70a9d34c5bf13d00 SHA512 441a803935c178bdd663360df058142c07d91aecd158d6be8f10b670fc2a295e79839914de6a85ced58a79591625c514e2ceabe87486092d8a1784c7e47a02b3 diff --git a/sci-electronics/irsim/irsim-9.7.93-r1.ebuild b/sci-electronics/irsim/irsim-9.7.93-r1.ebuild new file mode 100644 index 000000000000..38552dd190d4 --- /dev/null +++ b/sci-electronics/irsim/irsim-9.7.93-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="IRSIM is a \"switch-level\" simulator" +HOMEPAGE="http://opencircuitdesign.com/irsim/" +SRC_URI="http://opencircuitdesign.com/irsim/archive/${P}.tgz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-lang/tcl:= + dev-lang/tk:= +" +DEPEND="${RDEPEND}" +BDEPEND="app-shells/tcsh" + +PATCHES=( + "${WORKDIR}"/${P}-patches/${PN}-9.7.72-ldflags.patch + "${WORKDIR}"/${P}-patches/${PN}-9.7.79-datadir.patch + "${WORKDIR}"/${P}-patches/${PN}-9.7.93-clean-makefile.patch + "${WORKDIR}"/${P}-patches/${PN}-9.7.93-C99-port.patch + "${WORKDIR}"/${P}-patches/${PN}-9.7.93-Makefile.patch +) + +src_configure() { + # Short-circuit top-level configure script to retain CFLAGS + cd scripts || die + econf +} + +pkg_postinst() { + einfo + einfo "You will probably need to add to your ~/.Xdefaults" + einfo "the following line:" + einfo "irsim.background: black" + einfo + einfo "This is needed because Gentoo from default sets a" + einfo "grey background which makes impossible to see the" + einfo "simulation (white line on light gray background)." + einfo +} diff --git a/sci-electronics/irsim/metadata.xml b/sci-electronics/irsim/metadata.xml index 59be6adb7fb2..c9ff90a10614 100644 --- a/sci-electronics/irsim/metadata.xml +++ b/sci-electronics/irsim/metadata.xml @@ -12,4 +12,7 @@ little bit more realistic than the ideal, using the RC time constants to predict the relative timing of events. </longdescription> + <upstream> + <remote-id type="github">RTimothyEdwards/irsim</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest index 7fe42d17f047..4b6c9faac096 100644 --- a/sci-electronics/iverilog/Manifest +++ b/sci-electronics/iverilog/Manifest @@ -1,2 +1,3 @@ DIST iverilog-10.3.tar.gz 1600835 BLAKE2B 107c57c61fb27c18f4020f7853bf6ca83d1a86fdc73c57ea207828baf6b7a26d42e43ce7b33580f050a4c0b8f63bca6accecf678323a3bbbee1eb9c1d8fa2caa SHA512 67076e19a208576c21a0462ff7d15d00a9d47740c47518a5523bd928b3118360d85eb84c317963717d15e5246ece3727259f6ff3baf59e195340530cc9086a1d DIST iverilog-11.0.tar.gz 1682457 BLAKE2B ba90574e1453a095143e76e5dc79bb2357a721fc62c24f0fb23d220458819cb3b8ea8494410ce956e68831b682b61f27f64e94e9c166a69e5f6d5d30a8269a11 SHA512 5d6a65e1c3b6b62e99af708cd5a259cc69c6b789dd6eff69e225903d9b8c115d9e5d6f7635b30c6558197cd0ee6fd8196a163fbd98956e24c211d97328b85056 +DIST iverilog-12.0.tar.gz 2995096 BLAKE2B 7e1d4d8302168da3d38aac113daaaa62b80e59d7485be142443cd57ef346e788d9b58564af491a0ad58f64c06e475696238205f3e673f10da3c2cd417020fbed SHA512 a8e112f760903335ef2fbf00529e5fe282b83c1f583c4316373b9410d7fad2a53d5c4adb82dd62491c14a620cb5b1fab117cb0cde638c86b65fe5b7b0dd07152 diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild index a0e95ea74ac9..f79b88bc74f0 100644 --- a/sci-electronics/iverilog/iverilog-10.3.ebuild +++ b/sci-electronics/iverilog/iverilog-10.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git" else SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}/${PN}-${GITHUB_PV}" fi @@ -34,8 +34,8 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=" dev-util/gperf - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " PATCHES=( diff --git a/sci-electronics/iverilog/iverilog-11.0.ebuild b/sci-electronics/iverilog/iverilog-11.0.ebuild index c8842e156a9d..1599da817835 100644 --- a/sci-electronics/iverilog/iverilog-11.0.ebuild +++ b/sci-electronics/iverilog/iverilog-11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git" else SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}/${PN}-${GITHUB_PV}" fi @@ -32,8 +32,8 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=" dev-util/gperf - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " PATCHES=( diff --git a/sci-electronics/iverilog/iverilog-12.0.ebuild b/sci-electronics/iverilog/iverilog-12.0.ebuild new file mode 100644 index 000000000000..d212b9a78fc9 --- /dev/null +++ b/sci-electronics/iverilog/iverilog-12.0.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +GITHUB_PV=$(ver_rs 1- '_') + +DESCRIPTION="A Verilog simulation and synthesis tool" +HOMEPAGE=" + http://iverilog.icarus.com + https://github.com/steveicarus/iverilog +" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git" +else + SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + S="${WORKDIR}/${PN}-${GITHUB_PV}" +fi + +LICENSE="LGPL-2.1" +SLOT="0" + +DEPEND=" + sys-libs/readline:= + sys-libs/zlib +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-util/gperf + app-alternatives/yacc + app-alternatives/lex +" + +src_prepare() { + default + + # From upstreams autoconf.sh, to make it utilize the autotools eclass + # Here translate the autoconf.sh, equivalent to the following code + # > sh autoconf.sh + + # Autoconf in root ... + eautoconf + + # Precompiling lexor_keyword.gperf + gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf \ + > lexor_keyword.cc || die + # Precompiling vhdlpp/lexor_keyword.gperf + cd vhdlpp || die + gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf \ + > lexor_keyword.cc || die +} + +src_install() { + local DOCS=( *.txt ) + + default + + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples +} diff --git a/sci-electronics/iverilog/iverilog-9999.ebuild b/sci-electronics/iverilog/iverilog-9999.ebuild index de6fe18b47c9..ab2ce78d8adc 100644 --- a/sci-electronics/iverilog/iverilog-9999.ebuild +++ b/sci-electronics/iverilog/iverilog-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git" else SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}/${PN}-${GITHUB_PV}" fi @@ -32,8 +32,8 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=" dev-util/gperf - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " src_prepare() { @@ -47,10 +47,12 @@ src_prepare() { eautoconf # Precompiling lexor_keyword.gperf - gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die + gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf \ + > lexor_keyword.cc || die # Precompiling vhdlpp/lexor_keyword.gperf cd vhdlpp || die - gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die + gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf \ + > lexor_keyword.cc || die } src_install() { diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest index 93fe6567d4d1..54c056353961 100644 --- a/sci-electronics/kicad-footprints/Manifest +++ b/sci-electronics/kicad-footprints/Manifest @@ -1,2 +1,4 @@ -DIST kicad-footprints-6.0.9.tar.gz 31723499 BLAKE2B 33856d28a52f8f516c96c38c68aabe3d57c3f7eade5cb654cd0dca15f36263b9860f252468edf0b94f228c2497ef7e862cebfd023e2a166ce1696a89c1cff1e1 SHA512 43436a61fb1be66dc6cd6079e49e7af0f7d374f074874fd008eb45c2b3faee596e102173a274064a536f11c4525f223c9e8c2a33969811414811a226e69affaa -DIST kicad-footprints-7.0.0.tar.bz2 23928107 BLAKE2B 4f4a03b47f208ab431a41e6c20348e7d227a1dc6c24657308ff76cd800923993c2f937dbc737f5bdaa17703b6d1e435eac7b344a8f6462c500917ecffd4195a3 SHA512 fd6d7436838499a8ee1ed36ec23f1c7f85519e7f9641cb0a85556203dd51e7855e549d0cb1afe91c4a4885b62f87d4c765407d366728e6a6fbd64e75ac0ceb89 +DIST kicad-footprints-7.0.10.tar.bz2 24478270 BLAKE2B dd12467ba7bad3f0ab44164ea4ef6502f44143ec66173d5dadba62ab60559c0e75c4f77d00436ba2f7e1f0b527ae94cd0954fdd568031d049fbb69de56f13c0c SHA512 23fe7018f0f7328dc3d55e9f206d7ee4f4734be768d7024291b9d22c0134f1b887be5baf74fd601454e89a9a282aa9c0ad0ff631f5d29ec2ccac1c30b4dc1b66 +DIST kicad-footprints-7.0.11.tar.bz2 22722611 BLAKE2B f081eee0d8d2f9c691d7326dbc0a2edd329e027ae6602927f87e2e3c645fed1ba008e634a9043710ce552a94b01c28ac88461b83b97b26c225ad901af8535f21 SHA512 0786c08674432d797c7f98a05917ba22cfff4353e7b0e9007d61078cf6f5fc8ddf832e1a1e4d74788c9bf51fe9280ceae2c6051fce2253b5ba31b0a0f74d4511 +DIST kicad-footprints-8.0.3.tar.bz2 26585619 BLAKE2B ee9383770b4ebcab5cbf7576c71d71694c05760525267167923c3f8dd4d075c87d13402190455f9e7134815ea36ae8ca0fd84b51317f31120e816950cf42db15 SHA512 f61e56a4519708da19f9850f3102a0efbf73ebf276f821c1fc9f57d88f01ac7454002a32b8da7912bdfa2a4c5264254fad5d579329ea5eaf147ef2aade23ecc6 +DIST kicad-footprints-8.0.4.tar.bz2 26603867 BLAKE2B bf4e653cf25dd856985796f3f408648e98858a13afc6ed86a670d796abedba6fd291501f46e904fd1709f5553b678472e524110626126b3a0190b5e74f6b73cb SHA512 61191c33b07ffde61768befa9f2eaa32084a431cf1d5ac240e7e2c6c36b1129fae8e69f99dd3dd314c0f75c6ea7617eda2db5b564783079cf3e4f8a3ba781276 diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.9.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-7.0.10.ebuild index 8a46cc5de857..79680e3c930d 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.9.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-7.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,23 +12,15 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git" inherit git-r3 else - MY_PV="${PV/_rc/-rc}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~arm64 ~riscv ~x86" - fi - - S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi LICENSE="CC-BY-SA-4.0" SLOT="0" -IUSE="" -DEPEND="" -RDEPEND=">=sci-electronics/kicad-6.0.0" +RDEPEND=">=sci-electronics/kicad-7.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-footprints/kicad-footprints-7.0.0.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-7.0.11.ebuild index ba02cb94ca78..60f7cdb4bc3f 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-7.0.0.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-7.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,9 +19,7 @@ fi LICENSE="CC-BY-SA-4.0" SLOT="0" -IUSE="" -DEPEND="" RDEPEND=">=sci-electronics/kicad-7.0.0" if [[ ${PV} == 9999 ]] ; then diff --git a/sci-electronics/kicad-footprints/kicad-footprints-8.0.3.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-8.0.3.ebuild new file mode 100644 index 000000000000..57eb68c43c79 --- /dev/null +++ b/sci-electronics/kicad-footprints/kicad-footprints-8.0.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries" +HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git" + inherit git-r3 +else + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" + + KEYWORDS="amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" + +RDEPEND=">=sci-electronics/kicad-8.0.0" + +if [[ ${PV} == 9999 ]] ; then +# x11-misc-util/macros only required on live ebuilds + BDEPEND+=" >=x11-misc/util-macros-1.18" +fi diff --git a/sci-electronics/kicad-footprints/kicad-footprints-8.0.4.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-8.0.4.ebuild new file mode 100644 index 000000000000..7882a2e18c3c --- /dev/null +++ b/sci-electronics/kicad-footprints/kicad-footprints-8.0.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries" +HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git" + inherit git-r3 +else + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" + + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" + +RDEPEND=">=sci-electronics/kicad-8.0.0" + +if [[ ${PV} == 9999 ]] ; then +# x11-misc-util/macros only required on live ebuilds + BDEPEND+=" >=x11-misc/util-macros-1.18" +fi diff --git a/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild index c1edf53f4705..7882a2e18c3c 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,10 +19,8 @@ fi LICENSE="CC-BY-SA-4.0" SLOT="0" -IUSE="" -DEPEND="" -RDEPEND=">=sci-electronics/kicad-6.0.0" +RDEPEND=">=sci-electronics/kicad-8.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-footprints/metadata.xml b/sci-electronics/kicad-footprints/metadata.xml index fefcdb7b619c..64bf9844c919 100644 --- a/sci-electronics/kicad-footprints/metadata.xml +++ b/sci-electronics/kicad-footprints/metadata.xml @@ -5,6 +5,10 @@ <email>zoltan@sinustrom.info</email> <name>Zoltan Puskas</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.9.ebuild b/sci-electronics/kicad-meta/kicad-meta-7.0.10.ebuild index a9b6381bc4ae..5f2feada06fa 100644 --- a/sci-electronics/kicad-meta/kicad-meta-6.0.9.ebuild +++ b/sci-electronics/kicad-meta/kicad-meta-7.0.10.ebuild @@ -1,18 +1,15 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Electronic Schematic and PCB design tools (meta package)" HOMEPAGE="http://www.kicad.org" -SRC_URI="" LICENSE="metapackage" SLOT="0" -if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~arm64 ~riscv ~x86" -fi +KEYWORDS="amd64 ~arm64 ~riscv ~x86" IUSE="doc minimal" diff --git a/sci-electronics/kicad-meta/kicad-meta-7.0.0.ebuild b/sci-electronics/kicad-meta/kicad-meta-7.0.11.ebuild index 9fa1015e5396..e47e613dc36e 100644 --- a/sci-electronics/kicad-meta/kicad-meta-7.0.0.ebuild +++ b/sci-electronics/kicad-meta/kicad-meta-7.0.11.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Electronic Schematic and PCB design tools (meta package)" HOMEPAGE="http://www.kicad.org" -SRC_URI="" LICENSE="metapackage" SLOT="0" diff --git a/sci-electronics/kicad-meta/kicad-meta-8.0.3.ebuild b/sci-electronics/kicad-meta/kicad-meta-8.0.3.ebuild new file mode 100644 index 000000000000..5f2feada06fa --- /dev/null +++ b/sci-electronics/kicad-meta/kicad-meta-8.0.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Electronic Schematic and PCB design tools (meta package)" +HOMEPAGE="http://www.kicad.org" + +LICENSE="metapackage" +SLOT="0" + +KEYWORDS="amd64 ~arm64 ~riscv ~x86" + +IUSE="doc minimal" + +RDEPEND=" + >=sci-electronics/kicad-${PV} + >=sci-electronics/kicad-symbols-${PV} + >=sci-electronics/kicad-footprints-${PV} + doc? ( + >=app-doc/kicad-doc-${PV} + ) + !minimal? ( + >=sci-electronics/kicad-packages3d-${PV} + >=sci-electronics/kicad-templates-${PV} + ) +" diff --git a/sci-electronics/kicad-meta/kicad-meta-8.0.4.ebuild b/sci-electronics/kicad-meta/kicad-meta-8.0.4.ebuild new file mode 100644 index 000000000000..e47e613dc36e --- /dev/null +++ b/sci-electronics/kicad-meta/kicad-meta-8.0.4.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Electronic Schematic and PCB design tools (meta package)" +HOMEPAGE="http://www.kicad.org" + +LICENSE="metapackage" +SLOT="0" + +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + +IUSE="doc minimal" + +RDEPEND=" + >=sci-electronics/kicad-${PV} + >=sci-electronics/kicad-symbols-${PV} + >=sci-electronics/kicad-footprints-${PV} + doc? ( + >=app-doc/kicad-doc-${PV} + ) + !minimal? ( + >=sci-electronics/kicad-packages3d-${PV} + >=sci-electronics/kicad-templates-${PV} + ) +" diff --git a/sci-electronics/kicad-meta/metadata.xml b/sci-electronics/kicad-meta/metadata.xml index d69c4230a5e1..cd288a4d58f5 100644 --- a/sci-electronics/kicad-meta/metadata.xml +++ b/sci-electronics/kicad-meta/metadata.xml @@ -5,6 +5,10 @@ <email>zoltan@sinustrom.info</email> <name>Zoltan Puskas</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest index f576a4d1385b..c93efb943211 100644 --- a/sci-electronics/kicad-packages3d/Manifest +++ b/sci-electronics/kicad-packages3d/Manifest @@ -1,2 +1,4 @@ -DIST kicad-packages3d-6.0.9.tar.gz 953182554 BLAKE2B a0f9810d1236c3ef1b0adae3cc2f1d8172fb52add6a9d5666dd32431725a1d3fd0456119ef21b05bd390ec90fce359b46e846f0af063feb4f8d97bc69da57f68 SHA512 fe014b35ce9071ed48d00481d509fba678dc0bea5170f626de9b18c0e0285cb441fcc635197da40af869e35c50104a9a69d991348d6031293ee166b734ba7cc9 -DIST kicad-packages3d-7.0.0.tar.bz2 746772022 BLAKE2B 4975f0bbee80c05b3f29b6eca1cc699cf81433644042cf4c60365e333383e49a06b948291bf725e530ffa66d2232cb44ab31df4ae73c4db46d6d4e66b77b9091 SHA512 b01022907ea63b360bdfef708e24efe1f9aef7ac48e46b3707971d674ae26aa898888e28c316d508d7930291d161d95828dbbaa967175dab70b97bf1606dcedb +DIST kicad-packages3d-7.0.10.tar.bz2 773216530 BLAKE2B f45da926aa4621999c166014d6b578ace2b355343b1cf84db26f82084f27f50fd31ec1f76c91486958e6e15f353b0eac647e9251980c03f2b5522838edab5133 SHA512 c1ecf8ccb2f1e70d5981345e1f40bad6a09f1ccae4b5d67d3af3442699a3e99b6ff1a50b07a7530f6fe69d8070bd38138202f2903961afe239f11d99e1b1dd8b +DIST kicad-packages3d-7.0.11.tar.bz2 774735333 BLAKE2B af24617db4864b4630413132a0cc5643356ea1069f095b52f157083de8d7c4800e47847ff81379669ed2584bf8c5175e54d2cf6df9fe657bcbbe151af9529ea6 SHA512 7eb3699d79a2bff0369bd610fce20c7f128e7b650d7ce5082d28ab2b3683487ef7275c3b8e1927fdddda169917a0550304b563824c5f24f9b731d3ae04727fc6 +DIST kicad-packages3d-8.0.3.tar.bz2 785569695 BLAKE2B 7e8a125e37873b0bc4b0ff64e5d331f0c74ebd0e6611d30f2a6f2732fea9b67552ae3ac4de6466d2c64ed21c7af02f80186ad9370c0d97aabb82cb2cb663a76b SHA512 60192eba5413cc76d84f4065420fb8a01a80cb9b5cbfb58ba197ebe10befbdd33d9d4ccb75d33c45de791a8fc635bd1225aaf38ad61c5f1a3ce99d03376e44a0 +DIST kicad-packages3d-8.0.4.tar.bz2 785528686 BLAKE2B 7bdb20482a7c91f35541d0023931b45525a0d894e363c073b3cfed5b3ec9a1c8094791d7b070138a7cffe6b78189408bac5138e1d7d740a4543e6ac9d5ee76ef SHA512 258bdbe2c6048c790003c1879c75bd8b1e13e626444a2cfd8832afb7b55be01f8e45f3a050024be2855ea43d6150dd155c7659a25e9fcdf54c28fbc07092e5b1 diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.9.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.10.ebuild index 344b60c32007..0274962e3c8e 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.9.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,21 +12,16 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git" inherit git-r3 else - MY_PV="${PV/_rc/-rc}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${MY_PV}/kicad-packages3D-${MY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~arm64 ~riscv ~x86" - fi + SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN/3d/3D}-${PV}" + + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi -IUSE="+occ" LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]" +RDEPEND=">=sci-electronics/kicad-7.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.0.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.11.ebuild index 0814793b5346..ff642dcbe455 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.0.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,6 @@ else KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi -IUSE="" LICENSE="CC-BY-SA-4.0" SLOT="0" diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.3.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.3.ebuild new file mode 100644 index 000000000000..b2f360802e81 --- /dev/null +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit check-reqs cmake + +DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries" +HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git" + inherit git-r3 +else + SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN/3d/3D}-${PV}" + + KEYWORDS="amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" + +RDEPEND=">=sci-electronics/kicad-8.0.0" + +if [[ ${PV} == 9999 ]] ; then + # x11-misc-util/macros only required on live ebuilds + BDEPEND=">=x11-misc/util-macros-1.18" +fi + +CHECKREQS_DISK_BUILD="11G" diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.4.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.4.ebuild new file mode 100644 index 000000000000..d4b12654f757 --- /dev/null +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-8.0.4.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit check-reqs cmake + +DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries" +HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git" + inherit git-r3 +else + SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${PN/3d/3D}-${PV}" + + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" + +RDEPEND=">=sci-electronics/kicad-8.0.0" + +if [[ ${PV} == 9999 ]] ; then + # x11-misc-util/macros only required on live ebuilds + BDEPEND=">=x11-misc/util-macros-1.18" +fi + +CHECKREQS_DISK_BUILD="11G" diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild index c5aa25338d99..d4b12654f757 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,11 +18,10 @@ else KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi -IUSE="" LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-6.0.0" +RDEPEND=">=sci-electronics/kicad-8.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-packages3d/metadata.xml b/sci-electronics/kicad-packages3d/metadata.xml index 9a66c2bf0ec4..310e9a4252ce 100644 --- a/sci-electronics/kicad-packages3d/metadata.xml +++ b/sci-electronics/kicad-packages3d/metadata.xml @@ -5,6 +5,10 @@ <email>zoltan@sinustrom.info</email> <name>Zoltan Puskas</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> @@ -15,11 +19,6 @@ libs. Each directory directory contains multiple 3D model files, with the following supported file formats: WRL, STEP. </longdescription> - <use> - <flag name="occ"> - Use <pkg>sci-libs/opencascade</pkg> for data exchange - </flag> - </use> <upstream> <remote-id type="gitlab">kicad/libraries/kicad-packages3D</remote-id> </upstream> diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest index e63451e036a0..5e0a14be3ce9 100644 --- a/sci-electronics/kicad-symbols/Manifest +++ b/sci-electronics/kicad-symbols/Manifest @@ -1,2 +1,4 @@ -DIST kicad-symbols-6.0.9.tar.gz 4854079 BLAKE2B ba50c3062dc01145239d0950072bcaa6b61b2dbcf954fcf6e96e0d06c2c9952bd571c81a0e05dcdff462524c38e8c8807752e7d854eb7684397634414b55b8ab SHA512 2cc44ead8029cd502cc5301b4515aa23275d32068e091a0a4a645f6fd9ed88f2b7d329d9faa7e66cde58cedeb47810c66db8e6f9313c2bbfe18e5a272f82a163 -DIST kicad-symbols-7.0.0.tar.bz2 3012408 BLAKE2B 320cd9e05b9140cd5149651c91b68f69c2c23bda0026cb1cacf09447eda72159afc670b51a733ebfb02d89c61c0b60dbc298c53e1190c28fe4525303ca013615 SHA512 d72f01448a395f58a5ac87bfea33d514dc35749f7a529ee03b2a11ed1cc38331f0baaf69662686cf32ed4e629a3b2baf1a53cbcb9507fb8f2e4ffd3421184580 +DIST kicad-symbols-7.0.10.tar.bz2 3119612 BLAKE2B b5957fe4168bd325f7628110ccac1c40d24891c07d8b9618f8c7b1c3c612afd2e1efff82357ca1f4259e7dd06c1a11abf18f29e0e4b1dd8e531b9a80c94f5d8b SHA512 dd9b80a88a8ed10bb42c921f5d56ce4e82e2349b64a23e08f2d75d0903073e2e5132bce63d23d0b71116775392994dd5292742874e87b81bdb2b726f6c4c09f0 +DIST kicad-symbols-7.0.11.tar.bz2 3369887 BLAKE2B a32be647927ea56e5f806a38983001ed31e22495b3e6dd5c63f3f0b69c84c2efdbcc8c5d18aa6ee8060242f1b0ea5c96ca0f2e7c7a98a4cb8c4f69eec1985ae7 SHA512 16e2dc478500f5b7baff0e5205530d14bc5969b2b1cdf7158995f194c7984025edc54c6a3b460ebc352dec1d3eb01e28474b027aa8994adc6958e3d014018263 +DIST kicad-symbols-8.0.3.tar.bz2 3671038 BLAKE2B 6a76254b87ae14efd0d8e7edf2569755be902f16ef567c5b4bdd12b9c3e75a7a94437942e4affce378467daaa433d2ddb22fe32f7e39e5a60bd52e91faff23e2 SHA512 60ac5249281e783eae58d368b6521dbb5f0ef524a2be81d04b9578e6540baacf597300b5ac67566d2f91befbf67366eb8bb6cd0036b8773ecd753d91f5ab6cf8 +DIST kicad-symbols-8.0.4.tar.bz2 3672987 BLAKE2B 26a10b4acc9c89898221b02d4716f33790da2f6c896a6f4bad1e93eaac99323fad71c9de11065ee9392f6f7f42caaeafcc0f929271bbfee893ddd077c297205a SHA512 5a7d2c04db1953e515c6b008bb48692d2dce9cbbb883fb16cb81ef8189c44d359757ea53a1cfdbbf480e9cdeb6d7d0cd6c1b243523d189543611c2d9584fb8b5 diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.9.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-7.0.10.ebuild index 34f69ac0a947..ee13e8526636 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.9.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-7.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,19 +12,15 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git" inherit git-r3 else - SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.gz" + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~arm64 ~riscv ~x86" - fi + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi LICENSE="CC-BY-SA-4.0" SLOT="0" -IUSE="" -DEPEND="" -RDEPEND=">=sci-electronics/kicad-6.0.0" +RDEPEND=">=sci-electronics/kicad-7.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-symbols/kicad-symbols-7.0.0.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-7.0.11.ebuild index 26631a5e5f9f..812d1b0a931e 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-7.0.0.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-7.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,9 +19,7 @@ fi LICENSE="CC-BY-SA-4.0" SLOT="0" -IUSE="" -DEPEND="" RDEPEND=">=sci-electronics/kicad-7.0.0" if [[ ${PV} == 9999 ]] ; then diff --git a/sci-electronics/kicad-symbols/kicad-symbols-8.0.3.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-8.0.3.ebuild new file mode 100644 index 000000000000..5b10fa6c38b2 --- /dev/null +++ b/sci-electronics/kicad-symbols/kicad-symbols-8.0.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries" +HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git" + inherit git-r3 +else + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" + + KEYWORDS="amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" + +RDEPEND=">=sci-electronics/kicad-8.0.0" + +if [[ ${PV} == 9999 ]] ; then + # x11-misc-util/macros only required on live ebuilds + BDEPEND+=" >=x11-misc/util-macros-1.18" +fi diff --git a/sci-electronics/kicad-symbols/kicad-symbols-8.0.4.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-8.0.4.ebuild new file mode 100644 index 000000000000..4cea180f1254 --- /dev/null +++ b/sci-electronics/kicad-symbols/kicad-symbols-8.0.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries" +HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git" + inherit git-r3 +else + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" + + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" + +RDEPEND=">=sci-electronics/kicad-8.0.0" + +if [[ ${PV} == 9999 ]] ; then + # x11-misc-util/macros only required on live ebuilds + BDEPEND+=" >=x11-misc/util-macros-1.18" +fi diff --git a/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild index 52266ac8a79e..4cea180f1254 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,10 +19,8 @@ fi LICENSE="CC-BY-SA-4.0" SLOT="0" -IUSE="" -DEPEND="" -RDEPEND=">=sci-electronics/kicad-6.0.0" +RDEPEND=">=sci-electronics/kicad-8.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-symbols/metadata.xml b/sci-electronics/kicad-symbols/metadata.xml index 52d6a3a9dc64..6fcb0257a43a 100644 --- a/sci-electronics/kicad-symbols/metadata.xml +++ b/sci-electronics/kicad-symbols/metadata.xml @@ -5,6 +5,10 @@ <email>zoltan@sinustrom.info</email> <name>Zoltan Puskas</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest index d450d416a649..fcfb1e9ed182 100644 --- a/sci-electronics/kicad-templates/Manifest +++ b/sci-electronics/kicad-templates/Manifest @@ -1,2 +1,4 @@ -DIST kicad-templates-6.0.9.tar.gz 1057613 BLAKE2B c2c0c78093995629216cbcb93c40a05e1494da90a6cb91909e54fcb115fb7d6e10b3015a94200fef61407a6beccdc0f2bea84319531b39562bdf19ccf243a726 SHA512 f5e82599dc8532b2f286d62e650084b4d0470308a2cf447831027a85ea1028587342d51d4005018449f17fcbc9bd9f6ed850d7e3818c88692906790ef8981471 -DIST kicad-templates-7.0.0.tar.bz2 1419891 BLAKE2B 51747088a14a36a12270c18cd60f56e58a89419bf5b28a9b600b02a35606f6c142af80947e1e3f995c86df44e8af2181e012bfd0884cdccc317d3c1d8387eaf5 SHA512 e9ed2570a671e157ba03a6f89a3fa84983d3b48331f5cab6be2100cabe7004d5b83f15a00cec2fadd31dab5b584b2e51569f6425532ade8363075a300a47d86f +DIST kicad-templates-7.0.10.tar.bz2 1347681 BLAKE2B 0a6b2d06d257a21f32b1d5a5dfb90cf6f84f589b498faf292f0799a14dac8088482d9fa2a6cd55b2c3f9a145795cfeeb19e43b4a376ace22bab4f781fdba08ef SHA512 ee073bb615edb501075c703f60d4ba8015b489fb416d4a7709e552950904fc29b7c1dd32dd6edee2edf766d15cd1fe385c96c5d859ef89498abbb30714dcb919 +DIST kicad-templates-7.0.11.tar.bz2 1348043 BLAKE2B 8aa60440fb2344dbcf2336ed78694a5f07bc167475b0a75ff1095c3b72407feaa2a453bfb8a199529ae48d96bcd005f48b83e38dff1f7ea51005c45f0b8be6a9 SHA512 02248755e4b2cba8e496eb9e8349f6e5a88e11d95afbffae6dd87e423615c50744dc3f47b138ea253bb4b06d5c853d34d1980dadd7e18abbecbd7c032c7d0290 +DIST kicad-templates-8.0.3.tar.bz2 2783001 BLAKE2B 96c51de6dcecc371bb7b7ddef4807a95eb14d87459ec7b65f55bf79f6d4cda926f95a75bdda66b468e4f512b7f17b179f58cb307c69af9337e450f675071bf0e SHA512 267ffd98a1b18392257b7f35b938420f36da5022c40e5b86da18cb96636cbf71b52b62f2f4a70eae066c89751803f2a9fadb5f4f99940879e6da2eacac97787c +DIST kicad-templates-8.0.4.tar.bz2 2783175 BLAKE2B bd419b26e4ddff95de3e5af7d0bd6c53d54b8560e2e5a95a80585a93ec8dc3b82e26dfe48ce75962060aaeb84a7026bf5906280c946c68daee53bd7196a27656 SHA512 2cf72f160e2aa9600703afc3efbd2a72c64519db7121cf355278062aa4cc3e35e09f07024b36266b67496abfc30785ccda2a25589c77bfae58c7e2ea993ad067 diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild b/sci-electronics/kicad-templates/kicad-templates-7.0.10.ebuild index d8f7f7a3b81b..0efdfba630c0 100644 --- a/sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-7.0.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,18 +11,12 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git" inherit git-r3 else - MY_PV="${PV/_rc/-rc}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~arm64 ~riscv ~x86" - fi - - S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-6.0.0" +RDEPEND=">=sci-electronics/kicad-7.0.0" diff --git a/sci-electronics/kicad-templates/kicad-templates-7.0.0.ebuild b/sci-electronics/kicad-templates/kicad-templates-7.0.11.ebuild index bffd6445a28e..5bbfee81722b 100644 --- a/sci-electronics/kicad-templates/kicad-templates-7.0.0.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-7.0.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-electronics/kicad-templates/kicad-templates-8.0.3.ebuild b/sci-electronics/kicad-templates/kicad-templates-8.0.3.ebuild new file mode 100644 index 000000000000..e7f55b5f0e86 --- /dev/null +++ b/sci-electronics/kicad-templates/kicad-templates-8.0.3.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Electronic Schematic and PCB design tools project templates" +HOMEPAGE="https://github.com/kicad/kicad-templates" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git" + inherit git-r3 +else + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" + + KEYWORDS="amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" + +RDEPEND=">=sci-electronics/kicad-8.0.0" diff --git a/sci-electronics/kicad-templates/kicad-templates-8.0.4.ebuild b/sci-electronics/kicad-templates/kicad-templates-8.0.4.ebuild new file mode 100644 index 000000000000..56a84f2bc09a --- /dev/null +++ b/sci-electronics/kicad-templates/kicad-templates-8.0.4.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Electronic Schematic and PCB design tools project templates" +HOMEPAGE="https://github.com/kicad/kicad-templates" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git" + inherit git-r3 +else + SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" + + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="CC-BY-SA-4.0" +SLOT="0" + +RDEPEND=">=sci-electronics/kicad-8.0.0" diff --git a/sci-electronics/kicad-templates/kicad-templates-9999.ebuild b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild index db3c87def1eb..56a84f2bc09a 100644 --- a/sci-electronics/kicad-templates/kicad-templates-9999.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,4 +19,4 @@ fi LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-6.0.0" +RDEPEND=">=sci-electronics/kicad-8.0.0" diff --git a/sci-electronics/kicad-templates/metadata.xml b/sci-electronics/kicad-templates/metadata.xml index 4005d5615c79..15d540d17fa6 100644 --- a/sci-electronics/kicad-templates/metadata.xml +++ b/sci-electronics/kicad-templates/metadata.xml @@ -5,6 +5,10 @@ <email>zoltan@sinustrom.info</email> <name>Zoltan Puskas</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 92a0c48e970f..5b1fad841a20 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,2 +1,4 @@ -DIST kicad-6.0.9.tar.gz 45166663 BLAKE2B e4d45c589a8e76d7c121ac4ab7adefc5fd44d4ccbff7140196caec56c309f6e83d47a3ea9cf79f59de57c3bda43b3d32a2bea82c5850c2a7a58a6e1db27a06a7 SHA512 49e6bd3c9f6e0c9839c4fac18dc12dc7ef16183f6fbe8091992e2223c7fb085b3119d46797c0b0cf86fd2813e3c4def9eb1f2adbff1bf072a363f1a501da9354 -DIST kicad-7.0.0.tar.bz2 42583715 BLAKE2B 24fefe73bce6254bb47fdf21e8a82b7752e3f58cb3ea61220f0cf008c6570a4378f15bad54b81cc9257ec223bdb6128ccfd33f356e738b112c7b0e9481257255 SHA512 cb6f4cf6eee9a583d3a622bf8e48e5b604b047df0d742081cff1e5e387cf97cc1cd3f03fb58a17b44c47085634b95eea642bd1a6805e80807dbe0473c8d19d96 +DIST kicad-7.0.10.tar.bz2 43991960 BLAKE2B 3e21f575e41a6036ff2a9c3ab17472e51c73612ddadbf88631717b43024e604a8607fff013828823ff4db4d4263ac8e3bcc3b069e3efdfdc66fdb627f60f192a SHA512 f8005e6cb685c4cdc3982eec644f6d4a115138eaa19ca0bd2e6ae07613eac9c98fd7cdc181dd83e6c6d3c4b73ff6a54261ac5448a2a9c53298bc611c1bf408e1 +DIST kicad-7.0.11.tar.bz2 44083805 BLAKE2B d923581f49b3cf48776de56ba12ddc99e942269c0c14950bb6b3413fb616af74a1b4e7095fc746e20125096f7d2e4c7a9f271dd58918b22fa53e8ce7b78fa6f6 SHA512 28d5560ead989dcfb6d3b07e37443de3bf1883bd56604ae20f70c0a068504fd8745f7011507d417f487b86071cec130ac8eb7bda7513d096e78dcc3dc98585aa +DIST kicad-8.0.3.tar.bz2 72936035 BLAKE2B 667d6bc2e3a3f7ccc7a22a63d22702e6886404a86bca6ca2acdd5181c7046995332bb70f1fca9d25b20d9a7e1a9545488d00fb8d2ca70fd479a989ccea6c856f SHA512 14921827120381e749d094d2a76c850d2bee394c496859df3f4550a32b678a9523199a745e199f7c874ef85b2e8279129578e666c16932fbbcb1ba98c4e62b34 +DIST kicad-8.0.4.tar.bz2 72958676 BLAKE2B 756970ea920e8951d76a53596b46ca83b904e50f50474f03b2efa1aad815092c819b5ad144717bfeba7c778cd3fd18fc2f082beaf47e88a51f9acc575e8aaac2 SHA512 b490cd201b79388ca9ba771363043373034f036cc73e520cf1c4cf9c011dfd25a5e9c3eee8a7bfe23521193cd44f6c28aaf3e270e8444e7ba75dff62e6a74f1e diff --git a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch deleted file mode 100644 index cce508c1e888..000000000000 --- a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp kicad-6.0.6-new/common/tool/tool_manager.cpp ---- kicad-6.0.6/common/tool/tool_manager.cpp 2022-06-17 18:11:16.000000000 -0700 -+++ kicad-6.0.6-new/common/tool/tool_manager.cpp 2022-06-20 00:17:13.548239632 -0700 -@@ -902,7 +902,7 @@ - m_menuOwner = -1; - - // Restore cursor settings -- for( auto cursorSetting : m_cursorSettings ) -+ for( auto const& cursorSetting : m_cursorSettings ) - { - auto it = m_toolIdIndex.find( cursorSetting.first ); - wxASSERT( it != m_toolIdIndex.end() ); diff --git a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch deleted file mode 100644 index f1047cb9dee5..000000000000 --- a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/892499 -https://gitlab.com/kicad/code/kicad/-/commit/8c324f1fc8f7fcdb5e8f494da3d45997001fab4a - -From 8c324f1fc8f7fcdb5e8f494da3d45997001fab4a Mon Sep 17 00:00:00 2001 -From: jean-pierre charras <jp.charras@wanadoo.fr> -Date: Tue, 20 Dec 2022 12:46:19 +0100 -Subject: [PATCH] Fix a missing include. Fixes #13216 - https://gitlab.com/kicad/code/kicad/issues/13216 - ---- a/pcb_calculator/eserie.h -+++ b/pcb_calculator/eserie.h -@@ -2,7 +2,7 @@ - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2020 <janvi@veith.net> -- * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors. -+ * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the -@@ -21,6 +21,7 @@ - #include <array> - #include <vector> - #include <string> -+#include <cstdint> - - /** - * E-Values derived from a geometric sequence formula by Charles Renard were already --- -GitLab 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/files/kicad-8.0.3-gcc15-cstdint.patch b/sci-electronics/kicad/files/kicad-8.0.3-gcc15-cstdint.patch new file mode 100644 index 000000000000..26fb3dd20c25 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-8.0.3-gcc15-cstdint.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/937872 +https://gitlab.com/kicad/code/kicad/-/issues/18539 +https://gitlab.com/kicad/code/kicad/-/commit/0bf2d2ca32495dd40826a107e1be428a8e566a70 + +From 0bf2d2ca32495dd40826a107e1be428a8e566a70 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?= + <kacper.slominski72@gmail.com> +Date: Tue, 13 Aug 2024 13:41:35 -0400 +Subject: [PATCH] Fix build issue with experimental GCC version 15. + +Fixes https://gitlab.com/kicad/code/kicad/-/issues/18539 + +(cherry picked from commit e6bcc6d0a6a231f15326df0f0a2971c7aff8a384) +--- a/include/kicad_curl/kicad_curl_easy.h ++++ b/include/kicad_curl/kicad_curl_easy.h +@@ -38,6 +38,7 @@ + #include <memory> + #include <ostream> + #include <string> ++#include <cstdint> + + typedef void CURL; + struct curl_slist; +-- +GitLab diff --git a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch deleted file mode 100644 index d52a05d3bcf5..000000000000 --- a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kicad-6.0.2-orig/CMakeLists.txt kicad-6.0.2/CMakeLists.txt ---- kicad-6.0.2-orig/CMakeLists.txt 2022-02-10 16:29:07.000000000 -0800 -+++ kicad-6.0.2/CMakeLists.txt 2022-02-13 20:09:37.244713966 -0800 -@@ -950,7 +950,7 @@ - ### - if( UNIX AND NOT APPLE ) - install( DIRECTORY scripts -- DESTINATION ${KICAD_DOCS} -+ DESTINATION ${KICAD_BIN}/scripts - COMPONENT resources - PATTERN "*.bat" EXCLUDE - ) diff --git a/sci-electronics/kicad/kicad-6.0.9.ebuild b/sci-electronics/kicad/kicad-7.0.10-r1.ebuild index acb95eeca5df..b73e214f39f2 100644 --- a/sci-electronics/kicad/kicad-6.0.9.ebuild +++ b/sci-electronics/kicad/kicad-7.0.10-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) -WX_GTK_VER="3.0-gtk3" +PYTHON_COMPAT=( python3_{10..11} ) +WX_GTK_VER="3.2-gtk3" inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then 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.gz -> ${P}.tar.gz" + 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 @@ -28,63 +28,65 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples ngspice nls openmp +occ +pcm" +IUSE="doc examples nls openmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + # 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 +# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120 COMMON_DEPEND=" - !sci-electronics/kicad-i18n + 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= + <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + >sci-electronics/ngspice-27[shared] + sys-libs/zlib + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] - dev-python/wxpython:4.0[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) nls? ( sys-devel/gettext ) - occ? ( - >=sci-libs/opencascade-7.3.0:0= + test? ( + media-gfx/cairosvg ) " DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " -BDEPEND=">=dev-lang/swig-3.0 - doc? ( app-doc/doxygen )" +BDEPEND=">=dev-lang/swig-4.0 + doc? ( app-text/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" +CHECKREQS_DISK_BUILD="1500M" PATCHES=( - "${FILESDIR}/${PN}-scripts-install-fix.patch" - "${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch" - "${FILESDIR}/${PN}-6.0.9-gcc-13.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 } @@ -103,8 +105,8 @@ src_configure() { -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" -DKICAD_SCRIPTING_WXPYTHON=ON + -DKICAD_USE_EGL=OFF - # Merged from separate -i18n package, bug #830274 -DKICAD_BUILD_I18N="$(usex nls)" -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" @@ -113,19 +115,16 @@ src_configure() { -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" - -DKICAD_SPICE="$(usex ngspice)" - -DKICAD_PCM="$(usex pcm)" - - -DKICAD_USE_OCC="$(usex occ)" -DKICAD_INSTALL_DEMOS="$(usex examples)" -DCMAKE_SKIP_RPATH="ON" - ) - use occ && mycmakeargs+=( -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade + + -DKICAD_BUILD_QA_TESTS="$(usex test)" ) + setup-wxwidgets cmake_src_configure } @@ -138,7 +137,8 @@ src_compile() { 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 + mkdir -p "${BUILD_DIR}/qa/eeschema/" || die + dosym "${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 @@ -148,10 +148,11 @@ src_install() { cmake_src_install python_optimize + dodoc doxygen/eagle-plugin-notes.txt + 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/. + cd doxygen || die + dodoc -r out/html/. fi } diff --git a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild b/sci-electronics/kicad/kicad-7.0.11-r1.ebuild index a6db98a4f37a..009383220d05 100644 --- a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild +++ b/sci-electronics/kicad/kicad-7.0.11-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) WX_GTK_VER="3.2-gtk3" inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils @@ -28,13 +28,16 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples +ngspice nls openmp" +IUSE="doc examples nls openmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + # 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 +# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120 COMMON_DEPEND=" dev-db/unixODBC dev-libs/boost:=[context,nls] @@ -44,40 +47,39 @@ COMMON_DEPEND=" media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= + <sci-libs/opencascade-7.8.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + >sci-electronics/ngspice-27[shared] sys-libs/zlib + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] - ~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) nls? ( sys-devel/gettext ) + test? ( + media-gfx/cairosvg + ) " DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " BDEPEND=">=dev-lang/swig-4.0 - doc? ( app-doc/doxygen )" + doc? ( app-text/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" +CHECKREQS_DISK_BUILD="1500M" PATCHES=( - # https://bugs.gentoo.org/895188 - "${FILESDIR}"/${PN}-7.0.0-wxwidgets-version.patch - "${FILESDIR}"/${PN}-7.0.0-werror.patch ) @@ -85,7 +87,6 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp python-single-r1_pkg_setup - setup-wxwidgets check-reqs_pkg_setup } @@ -104,7 +105,7 @@ src_configure() { -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" -DKICAD_SCRIPTING_WXPYTHON=ON - -DKICAD_USE_EGL=ON + -DKICAD_USE_EGL=OFF -DKICAD_BUILD_I18N="$(usex nls)" -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" @@ -114,15 +115,16 @@ src_configure() { -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 + + -DKICAD_BUILD_QA_TESTS="$(usex test)" ) + setup-wxwidgets cmake_src_configure } @@ -135,7 +137,8 @@ src_compile() { 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 + mkdir -p "${BUILD_DIR}/qa/eeschema/" || die + dosym "${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 @@ -158,7 +161,6 @@ pkg_postinst() { 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 diff --git a/sci-electronics/kicad/kicad-8.0.3-r1.ebuild b/sci-electronics/kicad/kicad-8.0.3-r1.ebuild new file mode 100644 index 000000000000..185f4e17db69 --- /dev/null +++ b/sci-electronics/kicad/kicad-8.0.3-r1.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +WX_GTK_VER="3.2-gtk3" + +inherit check-reqs cmake flag-o-matic 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 nls openmp test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +# 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 +# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120 +COMMON_DEPEND=" + app-crypt/libsecret + dev-db/unixODBC + dev-libs/boost:=[context,nls] + dev-libs/libgit2:= + 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.5.0:0= + >=x11-libs/cairo-1.8.8:= + >=x11-libs/pixman-0.30 + >sci-electronics/ngspice-27[shared] + sys-libs/zlib + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] + $(python_gen_cond_dep ' + dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] + >=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + nls? ( + sys-devel/gettext + ) + test? ( + media-gfx/cairosvg + ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + sci-electronics/electronics-menu +" +BDEPEND=">=dev-lang/swig-4.0 + doc? ( app-text/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="1500M" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.3-gcc15-cstdint.patch +) + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + python-single-r1_pkg_setup + check-reqs_pkg_setup +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + default_src_unpack + fi +} + +src_prepare() { + filter-lto # Bug 927482 + cmake_src_prepare +} + +src_configure() { + xdg_environment_reset + + local mycmakeargs=( + -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" + + -DKICAD_SCRIPTING_WXPYTHON=ON + -DKICAD_USE_EGL=OFF + + -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_INSTALL_DEMOS="$(usex examples)" + -DCMAKE_SKIP_RPATH="ON" + + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade + + -DKICAD_SPICE_QA="$(usex test)" + -DKICAD_BUILD_QA_TESTS="$(usex test)" + ) + + setup-wxwidgets + 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. + mkdir -p "${BUILD_DIR}/qa/eeschema/" || die + ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + + export CMAKE_SKIP_TESTS=( + qa_pcbnew + qa_cli + ) + + # LD_LIBRARY_PATH is there to help it pick up the just-built libraries + LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${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 "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/kicad-8.0.4.ebuild b/sci-electronics/kicad/kicad-8.0.4.ebuild new file mode 100644 index 000000000000..4cbb09a09b4b --- /dev/null +++ b/sci-electronics/kicad/kicad-8.0.4.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +WX_GTK_VER="3.2-gtk3" + +inherit check-reqs cmake flag-o-matic 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 nls openmp test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +# 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 +# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120 +COMMON_DEPEND=" + app-crypt/libsecret + dev-db/unixODBC + dev-libs/boost:=[context,nls] + dev-libs/libgit2:= + 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.5.0:0= + >=x11-libs/cairo-1.8.8:= + >=x11-libs/pixman-0.30 + >sci-electronics/ngspice-27[shared] + sys-libs/zlib + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] + $(python_gen_cond_dep ' + dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] + >=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + nls? ( + sys-devel/gettext + ) + test? ( + media-gfx/cairosvg + ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + sci-electronics/electronics-menu +" +BDEPEND=">=dev-lang/swig-4.0 + doc? ( app-text/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="1500M" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.3-gcc15-cstdint.patch +) + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + python-single-r1_pkg_setup + check-reqs_pkg_setup +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + default_src_unpack + fi +} + +src_prepare() { + filter-lto # Bug 927482 + cmake_src_prepare +} + +src_configure() { + xdg_environment_reset + + local mycmakeargs=( + -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" + + -DKICAD_SCRIPTING_WXPYTHON=ON + -DKICAD_USE_EGL=OFF + + -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_INSTALL_DEMOS="$(usex examples)" + -DCMAKE_SKIP_RPATH="ON" + + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade + + -DKICAD_SPICE_QA="$(usex test)" + -DKICAD_BUILD_QA_TESTS="$(usex test)" + ) + + setup-wxwidgets + 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. + mkdir -p "${BUILD_DIR}/qa/eeschema/" || die + ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + + export CMAKE_SKIP_TESTS=( + qa_cli + ) + + # LD_LIBRARY_PATH is there to help it pick up the just-built libraries + LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${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 "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/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index 0a613e92f79e..71443e470a09 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..12} ) WX_GTK_VER="3.2-gtk3" -inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils +inherit check-reqs cmake flag-o-matic 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 +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git" inherit git-r3 else @@ -28,55 +28,57 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples +ngspice nls openmp" +IUSE="doc examples nls openmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + # 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 +# Depend wxGTK version needs to be limited due to switch from EGL to GLX, bug #911120 COMMON_DEPEND=" + app-crypt/libsecret dev-db/unixODBC dev-libs/boost:=[context,nls] + dev-libs/libgit2:= 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= + >=sci-libs/opencascade-7.5.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + >sci-electronics/ngspice-27[shared] sys-libs/zlib + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] - ~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) nls? ( sys-devel/gettext ) + test? ( + media-gfx/cairosvg + ) " DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " BDEPEND=">=dev-lang/swig-4.0 - doc? ( app-doc/doxygen )" + doc? ( app-text/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=( - "${FILESDIR}"/${PN}-7.0.0-werror.patch -) +CHECKREQS_DISK_BUILD="1500M" pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -94,6 +96,11 @@ src_unpack() { fi } +src_prepare() { + filter-lto # Bug 927482 + cmake_src_prepare +} + src_configure() { xdg_environment_reset @@ -101,7 +108,7 @@ src_configure() { -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" -DKICAD_SCRIPTING_WXPYTHON=ON - -DKICAD_USE_EGL=ON + -DKICAD_USE_EGL=OFF -DKICAD_BUILD_I18N="$(usex nls)" -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" @@ -111,13 +118,14 @@ src_configure() { -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 + + -DKICAD_SPICE_QA="$(usex test)" + -DKICAD_BUILD_QA_TESTS="$(usex test)" ) cmake_src_configure @@ -132,10 +140,17 @@ src_compile() { src_test() { # Test cannot find library in Portage's sandbox. Let's create a link so test can run. + mkdir -p "${BUILD_DIR}/qa/eeschema/" || die ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + export CMAKE_SKIP_TESTS=( + qa_pcbnew + qa_cli + ) + # 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 + LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \ + cmake_src_test } src_install() { @@ -155,7 +170,6 @@ pkg_postinst() { 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 diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml index 36c0a94d2d79..07c75b4303e6 100644 --- a/sci-electronics/kicad/metadata.xml +++ b/sci-electronics/kicad/metadata.xml @@ -5,15 +5,14 @@ <email>zoltan@sinustrom.info</email> <name>Zoltan Puskas</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <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="pcm">Enable plugin content manager</flag> - </use> <longdescription> Kicad is an open source (GPL) software for the creation of electronic schematic diagrams and printed circuit board artwork. diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index 0a10a45e75f9..328e9c04e415 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -1,2 +1 @@ -DIST klayout-0.27.12.tar.gz 57616686 BLAKE2B 18c69c799412554547f9b671c80f097b93b15fb04272c4ea6f06b54783fa97ac0da5f50ea61fbf88e75e5436524c9271ffdb7560911b7b8e130a4a287ba2cf60 SHA512 25bb854b9f265801a9ee13bdead0ae1fa4ce21bd0d018c10b0c89aff72f48d4131e80987750bd47e3996296ced1936fffb4ed02daa5a7bdff5f05ae6e820e067 -DIST klayout-0.28.5.tar.gz 88218961 BLAKE2B 59154bc1cc6596c4deb10b9c59f8957c2fcb8815b8d8ab09e79521a2e281e82d5437a222a48e0f378188b34162cd92229694c58e15ff74b6cde4c2b65df7bfe7 SHA512 ae2f4a08d8939eccba41f2a76ef3e1a97bdd61925329f3d3c314206dfc2783e0db0ffad58cc1357355f0853079987b9c083dde78ae29914b4db8aadc24181082 +DIST klayout-0.28.9.tar.gz 88388706 BLAKE2B 0997bf15aae1dd1e8356fec91ae281511751db0ae1a4bfdfde38d5a04392351a7893206806a0eb7d842f8ee2fd7819b1a86257376d3ba5af11bb81b84836e571 SHA512 dcd882ef84161f2d28195f8e0239fd122f17f9954e5cc146f71bbb6816b9fb723eb3b0299e01fbb293ef7fb7f87c25efbfe09126349ee13f89de68c5bb5f7e93 diff --git a/sci-electronics/klayout/klayout-0.28.5.ebuild b/sci-electronics/klayout/klayout-0.28.5.ebuild deleted file mode 100644 index 8aceae0ea200..000000000000 --- a/sci-electronics/klayout/klayout-0.28.5.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -RUBY_OPTIONAL=no -USE_RUBY="ruby27" -# note: define maximally ONE implementation here - -PYTHON_COMPAT=( python3_{9,10,11} ) - -inherit toolchain-funcs python-single-r1 ruby-ng - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git" - inherit git-r3 - EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} -else - SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" -HOMEPAGE="https://www.klayout.de/" -LICENSE="GPL-2" -SLOT="0" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - sys-libs/zlib - ${PYTHON_DEPS} - $(ruby_implementations_depend) -" -DEPEND="${RDEPEND}" - -pkg_setup() { - python-single-r1_pkg_setup - ruby-ng_pkg_setup -} - -each_ruby_configure() { - tc-export CC CXX AR LD RANLIB - export CFLAGS CXXFLAGS - ./build.sh \ - -expert \ - -dry-run \ - -qmake "$EPREFIX/usr/$(get_libdir)/qt5/bin/qmake" \ - -ruby "${RUBY}" \ - -python "${PYTHON}" \ - -build . \ - -bin "${T}/bin" \ - -rpath "$EPREFIX/usr/$(get_libdir)/klayout" \ - -option "${MAKEOPTS}" \ - -with-qtbinding \ - -without-64bit-coord \ - -qt5 || die "Configuration failed" -} - -each_ruby_compile() { - emake all -} - -each_ruby_install() { - emake install - - cd "${T}/bin" || die - - dodir "/usr/$(get_libdir)/klayout" - mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die - - mkdir -p "${D}/$(python_get_sitedir)" || die - mv pymod/* "${D}/$(python_get_sitedir)/" || die - rmdir pymod || die - - dobin * - - python_optimize -} diff --git a/sci-electronics/klayout/klayout-0.27.12.ebuild b/sci-electronics/klayout/klayout-0.28.9.ebuild index 87201edfa6b9..a67a35ae96a7 100644 --- a/sci-electronics/klayout/klayout-0.27.12.ebuild +++ b/sci-electronics/klayout/klayout-0.28.9.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 RUBY_OPTIONAL=no -USE_RUBY="ruby27" +USE_RUBY="ruby31" # note: define maximally ONE implementation here -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11,12} ) inherit toolchain-funcs python-single-r1 ruby-ng diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild index 8aceae0ea200..a09175915e24 100644 --- a/sci-electronics/klayout/klayout-9999.ebuild +++ b/sci-electronics/klayout/klayout-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 RUBY_OPTIONAL=no -USE_RUBY="ruby27" +USE_RUBY="ruby31" # note: define maximally ONE implementation here -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11,12} ) inherit toolchain-funcs python-single-r1 ruby-ng diff --git a/sci-electronics/klayout/metadata.xml b/sci-electronics/klayout/metadata.xml index d05a4868cfa5..515e8491e641 100644 --- a/sci-electronics/klayout/metadata.xml +++ b/sci-electronics/klayout/metadata.xml @@ -9,4 +9,7 @@ <email>sci-electronics@gentoo.org</email> <name>Gentoo Electronics Project</name> </maintainer> +<upstream> + <remote-id type="github">KLayout/klayout</remote-id> +</upstream> </pkgmetadata> diff --git a/sci-electronics/ktechlab/Manifest b/sci-electronics/ktechlab/Manifest index e9667a6cfa18..4f29c2c1741b 100644 --- a/sci-electronics/ktechlab/Manifest +++ b/sci-electronics/ktechlab/Manifest @@ -1 +1 @@ -DIST ktechlab-0.50.0.tar.xz 2195752 BLAKE2B 213bee84364f8fc99ee6991ca465ce126f7fd16932a9e399947428955156500ce57e2c93170e16698b3d5e64f294ea208bff388c0d8e2ee6551bbe97e785233e SHA512 236be69f18ae21f1dffe1ae3d9e55665b6bdfd443bf6b3ae39c2e370923bae679fe8b1b09dac3d354a61278ca9f85113804a47a95a7f1de996b330f5a4b13a42 +DIST ktechlab-0.51.0.tar.xz 2280352 BLAKE2B 9f7004bf82a6f1c5c2b7a638692eb7ea778a3680ebf73db3caa1947a0ebd62249f1d15f9508852af5cf347907051d8f4757899692a8677a1b76bac12dad45cc7 SHA512 65c71bafb4ea90dbe34860ebefa8c05b393953d690309d61a53fa9f012e14a2544c03c2aeac2c79e700d449ed84d7d691beafdf398348fe02ad1562b326c0c40 diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch deleted file mode 100644 index 20222c89daab..000000000000 --- a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1b814b266f1bd25d92b701e071473f2267330933 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org> -Date: Mon, 22 Mar 2021 12:49:26 +0100 -Subject: [PATCH] fix crash when looking for where connectors diverge - ---- - src/electronics/ecnode.cpp | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/electronics/ecnode.cpp b/src/electronics/ecnode.cpp -index 385844c1..28f2a556 100644 ---- a/src/electronics/ecnode.cpp -+++ b/src/electronics/ecnode.cpp -@@ -225,10 +225,18 @@ QPoint ECNode::findConnectorDivergePoint(bool *found) - if (!gotP1 || !gotP2 ) - return QPoint(0,0); - -- unsigned maxLength = p1.size() > p2.size() ? p1.size() : p2.size(); -+ // If they are differing lengths, return the end of the shortest -+ if (p1.size() < p2.size()) { -+ *found = true; -+ return p1.last(); -+ } else if (p2.size() < p1.size()) { -+ *found = true; -+ return p2.last(); -+ } -+ -+ Q_ASSERT(p1.size() == p2.size()); - -- for ( unsigned i = 1; i < maxLength; ++i ) -- { -+ for (unsigned i = 1; i < qMin(p1.size(), p2.size()); ++i) { - if ( p1[i] != p2[i] ) { - *found = true; - return p1[i-1]; --- -GitLab - diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch deleted file mode 100644 index ec970b64ad81..000000000000 --- a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 730a5492e4780504a80db1a27dc307d8f61b4696 Mon Sep 17 00:00:00 2001 -From: Zoltan Padrah <zoltan_padrah@users.sf.net> -Date: Fri, 18 Dec 2020 20:47:55 +0200 -Subject: [PATCH] property editor: fix crash when changing a property and - clicking circuit - -apparently Ubuntu 18.04 is affected (Qt 5.9.5) -and Ubuntu 20.04 is not (Qt 5.12.8). - -to reproduce: - -1. place and select a resistor -2. in the property editor click on any of its properties, - in order to start editing it -3. click on the circuit, to stop editing of the properties -3.1. Expected: property value is kept, program continues -3.2. Actually: crash with the same stack trace from above - -Should fix issue on GitHub: -https://github.com/ktechlab/ktechlab/issues/60 ---- - src/gui/itemeditor/propertyeditor.cpp | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/gui/itemeditor/propertyeditor.cpp b/src/gui/itemeditor/propertyeditor.cpp -index 88b86842..60821177 100644 ---- a/src/gui/itemeditor/propertyeditor.cpp -+++ b/src/gui/itemeditor/propertyeditor.cpp -@@ -476,8 +476,19 @@ void PropertyEditor::showDefaultsButton(bool show) - - void PropertyEditor::updateDefaultsButton() - { -- if (!m_editItem) -+ QTableWidgetItem *currItem = currentItem(); -+ if (!currItem) { -+ m_editItem = nullptr; - return; -+ } -+ m_editItem = dynamic_cast<PropertyEditorItem*>(currItem); -+ if (!m_editItem) { -+ qWarning() << "failed to cast current item to PropertyEditorItem, " << currItem; -+ return; -+ } -+ qDebug() << "currentItem=" << currentItem(); -+ qDebug() << "m_editItem=" << m_editItem; -+ qDebug() << "m_editItem->property=" << m_editItem->property(); - showDefaultsButton( m_editItem->property()->changed() ); - repaint(); // m_editItem->repaint(); - } --- -GitLab - diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch deleted file mode 100644 index c72fdd60021b..000000000000 --- a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e0bb9ff940f6eda544342c499998cf6142258629 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org> -Date: Sun, 20 Dec 2020 14:43:31 +0100 -Subject: [PATCH] fix odd crash - ---- - src/nodegroup.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nodegroup.cpp b/src/nodegroup.cpp -index f4cfa2b4..94430409 100644 ---- a/src/nodegroup.cpp -+++ b/src/nodegroup.cpp -@@ -142,8 +142,7 @@ void NodeGroup::updateRoutes() - Node *next = (routeIt == routeEnd) ? n2 : (Node *)*(routeIt++); - removeRoutedNodes(¤tList, prev, next); - QPointList pointList = *it; -- if ( prev != n1 ) -- { -+ if (!pointList.isEmpty() && prev != n1) { - QPoint first = pointList.first(); - prev->moveBy( first.x() - prev->x(), first.y() - prev->y() ); - } --- -GitLab - diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch deleted file mode 100644 index 67ded56c9594..000000000000 --- a/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch +++ /dev/null @@ -1,317 +0,0 @@ -From 76764e7f7b64d36fc4f650516838662b406aa8ac Mon Sep 17 00:00:00 2001 -From: Pino Toscano <pino@kde.org> -Date: Mon, 2 Nov 2020 18:53:22 +0100 -Subject: [PATCH 1/4] cmake: stop requiring the Solid framework - -It is not used. - -(cherry picked from commit aaf83474c8a145ad67ed03074dd4033f5a12c2ab) ---- - CMakeLists.txt | 1 - - README | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 15efb196..73e40695 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,6 @@ find_package(KF5 REQUIRED COMPONENTS - Parts - TextEditor - TextWidgets -- Solid - WidgetsAddons - WindowSystem - XmlGui -diff --git a/README b/README -index 940e2b3b..9f91740d 100644 ---- a/README -+++ b/README -@@ -122,7 +122,7 @@ Required dependencies - - Extra Cmake Modules (ECM) - - KDE Frameworks 5 libraries -dev (at the time of writing: - Config CoreAddons DocTools IconThemes I18n KDELibs4Support -- KHtml KIO Parts TextEditor TextWidgets Solid WidgetsAddons -+ KHtml KIO Parts TextEditor TextWidgets WidgetsAddons - WindowSystem XmlGui) - - Optional dependencies --- -2.29.2 - - -From 672dc6a1d4b8d1fd8f44b64779a43f0e4b65e946 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <pino@kde.org> -Date: Mon, 2 Nov 2020 13:10:45 +0100 -Subject: [PATCH 2/4] cmake: build test_ktechlab only if testing is enabled - -The test_ktechlab static library basically builds almost all the -ktechlab sources, resulting in a "double build" in case testing is -enabled. Considering that is used only by test binaries built only -when testing is enabled, then limit its build accordingly. - -(cherry picked from commit f3a754ddcbc8a086ca48920bd33e96082cef699c) ---- - src/CMakeLists.txt | 26 +++++++++++++++----------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e84f737d..1a9af964 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -379,19 +379,23 @@ install(TARGETS ktechlab ${INSTALL_TARGETS_DEFAULT_ARGS}) - - # for helping testing - --add_library(test_ktechlab STATIC ${ktechlab_SRCS}) -+if(BUILD_TESTING) - --target_link_libraries(test_ktechlab -- KF5::TextEditor -- KF5::IconThemes -- KF5::Parts -- KF5::KHtml -- KF5::WidgetsAddons -- KF5::WindowSystem -+ add_library(test_ktechlab STATIC ${ktechlab_SRCS}) - -- Qt5::Widgets -- Qt5::PrintSupport --) -+ target_link_libraries(test_ktechlab -+ KF5::TextEditor -+ KF5::IconThemes -+ KF5::Parts -+ KF5::KHtml -+ KF5::WidgetsAddons -+ KF5::WindowSystem -+ -+ Qt5::Widgets -+ Qt5::PrintSupport -+ ) -+ -+endif() - - ########### install files ############### - --- -2.29.2 - - -From 1d416ac6e3191eefca0f7e98487ae912d8bafe23 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <pino@kde.org> -Date: Wed, 4 Nov 2020 13:13:44 +0100 -Subject: [PATCH 3/4] cmake: explicitly require and link to KCompletion - -It is already used (because of KLineEdit), so make sure to explicitly -use it. - -(cherry picked from commit 852f94f4e6f3cb8d4e4ec60c2c77dfd5ae4b6fc0) ---- - CMakeLists.txt | 1 + - src/CMakeLists.txt | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73e40695..45442519 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,6 +31,7 @@ find_package(Qt5 CONFIG REQUIRED COMPONENTS - ) - - find_package(KF5 REQUIRED COMPONENTS -+ Completion - Config - CoreAddons - DocTools -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1a9af964..ac6e487a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -343,6 +343,7 @@ target_link_libraries( ktechlab - #itemeditor math - KF5::TextEditor - KF5::Parts -+ KF5::Completion - KF5::ConfigCore - KF5::ConfigGui - KF5::CoreAddons -@@ -390,6 +391,7 @@ if(BUILD_TESTING) - KF5::KHtml - KF5::WidgetsAddons - KF5::WindowSystem -+ KF5::Completion - - Qt5::Widgets - Qt5::PrintSupport --- -2.29.2 - - -From 56fb8dde63c19f6c4bc0decda879843e552fad85 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org> -Date: Tue, 22 Dec 2020 11:46:54 +0100 -Subject: [PATCH 4/4] replace khtml with qtextbrowser - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 1 - - src/CMakeLists.txt | 2 -- - src/gui/contexthelp.cpp | 33 +++++++++++------------------- - src/gui/contexthelp.h | 6 ++---- - tests/tests_app/CMakeLists.txt | 1 - - tests/tests_compile/CMakeLists.txt | 1 - - 6 files changed, 14 insertions(+), 30 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45442519..5adaec45 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,7 +37,6 @@ find_package(KF5 REQUIRED COMPONENTS - DocTools - IconThemes - I18n -- KHtml - KIO - Parts - TextEditor -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ac6e487a..e09d9070 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -349,7 +349,6 @@ target_link_libraries( ktechlab - KF5::CoreAddons - KF5::IconThemes - KF5::KIOCore -- KF5::KHtml - KF5::XmlGui - KF5::WidgetsAddons - KF5::WindowSystem -@@ -388,7 +387,6 @@ if(BUILD_TESTING) - KF5::TextEditor - KF5::IconThemes - KF5::Parts -- KF5::KHtml - KF5::WidgetsAddons - KF5::WindowSystem - KF5::Completion -diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp -index 567c0c3d..cce84617 100644 ---- a/src/gui/contexthelp.cpp -+++ b/src/gui/contexthelp.cpp -@@ -20,8 +20,6 @@ - - #include <KParts/ReadWritePart> - #include <KParts/BrowserExtension> --#include <KHTMLView> --#include <KHTMLPart> - #include <KIO/Global> - #include <KIconLoader> - #include <KLocalizedString> -@@ -43,6 +41,7 @@ - // #include <q3widgetstack.h> - #include <QMimeData> - #include <QStandardPaths> -+#include <QTextBrowser> - - #include <cassert> - -@@ -81,15 +80,13 @@ ContextHelp::ContextHelp( KateMDI::ToolView * parent ) - m_pNameLabel->setFont( font ); - m_pNameLabel->setTextFormat( Qt::RichText ); - -- m_pBrowser = new KHTMLPart( m_pWidgetStack->widget( 0 ) ); -- m_pBrowserView = m_pBrowser->view(); -+ m_pBrowserView = new QTextBrowser; -+ m_pBrowserView->setOpenLinks(false); -+ - m_pBrowserView->setFocusPolicy( Qt::NoFocus ); - m_pBrowserLayout->addWidget( m_pBrowserView ); -- connect(m_pBrowser->browserExtension(), &KParts::BrowserExtension::openUrlRequest, -- this, &ContextHelp::openURL); - -- // Adjust appearance of browser -- m_pBrowserView->setMarginWidth( 4 ); -+ connect(m_pBrowserView, &QTextBrowser::anchorClicked, this, &ContextHelp::openURL); - - m_pEditor = new RichTextEditor( m_pWidgetStack->widget( 1 ), "ContextHelpEditor" ); - m_pTopLayout->addWidget( m_pEditor ); -@@ -280,20 +277,14 @@ void ContextHelp::setContextHelp( QString name, QString help ) - addLinkTypeAppearances( & help ); - //END modify help string as appropriate - -- // HACK Adjust top spacing according to whether the item description uses <p>. -- // This is because the help editor uses paragraphs, but old item help stored -- // in the items just uses <br> -- QFont f; -- int fontPixelSize = QFontInfo( f ).pixelSize(); -- if ( help.contains( "<p>" ) ) -- m_pBrowserView->setMarginHeight( 3-fontPixelSize ); -- else -- m_pBrowserView->setMarginHeight( 3 ); -- - m_pNameLabel->setText( name ); -- m_pBrowser->begin( QUrl::fromLocalFile( itemLibrary()->itemDescriptionsDirectory() ) ); -- m_pBrowser->write( help ); -- m_pBrowser->end(); -+ m_pBrowserView->setSearchPaths({itemLibrary()->itemDescriptionsDirectory()}); -+ m_pBrowserView->clear(); -+ if (help.startsWith("<html>")) { -+ m_pBrowserView->insertHtml(help); -+ } else { -+ m_pBrowserView->insertPlainText(help); -+ } - } - - -diff --git a/src/gui/contexthelp.h b/src/gui/contexthelp.h -index fe992deb..7190ea81 100644 ---- a/src/gui/contexthelp.h -+++ b/src/gui/contexthelp.h -@@ -20,8 +20,7 @@ class Item; - class ContextHelp; - class RichTextEditor; - --class KHTMLPart; --class KHTMLView; -+class QTextBRowser; - class QUrl; - class QLabel; - class QTextBrowser; -@@ -123,8 +122,7 @@ class ContextHelp : public QWidget, public Ui::ContextHelpWidget - bool isEditChanged(); - QString m_currentLanguage; - QString m_lastItemType; -- KHTMLPart * m_pBrowser; -- KHTMLView * m_pBrowserView; -+ QTextBrowser *m_pBrowserView; - RichTextEditor * m_pEditor; - - private slots: -diff --git a/tests/tests_app/CMakeLists.txt b/tests/tests_app/CMakeLists.txt -index b0a505d4..c93137a4 100644 ---- a/tests/tests_app/CMakeLists.txt -+++ b/tests/tests_app/CMakeLists.txt -@@ -36,7 +36,6 @@ target_link_libraries( tests_app - KF5::ConfigCore - KF5::ConfigGui - KF5::KIOCore -- KF5::KHtml - KF5::CoreAddons - KF5::XmlGui - KF5::TextEditor -diff --git a/tests/tests_compile/CMakeLists.txt b/tests/tests_compile/CMakeLists.txt -index 424692be..bec8b864 100644 ---- a/tests/tests_compile/CMakeLists.txt -+++ b/tests/tests_compile/CMakeLists.txt -@@ -37,7 +37,6 @@ target_link_libraries( test_compile - KF5::ConfigCore - KF5::ConfigGui - KF5::KIOCore -- KF5::KHtml - KF5::CoreAddons - KF5::XmlGui - KF5::TextEditor --- -2.29.2 - diff --git a/sci-electronics/ktechlab/ktechlab-0.50.0-r2.ebuild b/sci-electronics/ktechlab/ktechlab-0.51.0.ebuild index 6359c002ea9a..f2ad43fcf17f 100644 --- a/sci-electronics/ktechlab/ktechlab-0.50.0-r2.ebuild +++ b/sci-electronics/ktechlab/ktechlab-0.51.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ ECM_EXAMPLES="true" ECM_HANDBOOK="forceoptional" ECM_TEST="true" KDE_ORG_CATEGORY="sdk" -KFMIN=5.74.0 -QTMIN=5.15.1 +KFMIN=5.82.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="IDE for microcontrollers and electronics" @@ -24,6 +24,7 @@ DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtserialport-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -43,8 +44,3 @@ DEPEND=" gpsim? ( dev-embedded/gpsim ) " RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-deps.patch - "${FILESDIR}"/${P}-crashfix{-propertyeditor,-connectors-diverging,}.patch -) diff --git a/sci-electronics/labone/Manifest b/sci-electronics/labone/Manifest index 0c19990b3df3..3eca86897a17 100644 --- a/sci-electronics/labone/Manifest +++ b/sci-electronics/labone/Manifest @@ -1 +1,2 @@ DIST LabOneLinux64-21.08.20515.tar.gz 399058267 BLAKE2B 624c4dc4a01edb69f9b36a435744d10b3638c91c7ac0c1e9765cf913e605fe32d1935fa131d650f38a5b713df916d92b985ac5f6489b031bba9b6ec8a1370d4a SHA512 f229a885ea91cc518c4819ad76a928829eb1699603ba48fb745d4a99faca116b100831c17a48243922912c68de27b7938387677ffa2e996a122f36c33d0a205c +DIST LabOneLinux64-23.02.42414.tar.gz 509402101 BLAKE2B 3bd083830b6dd286ba58227fcfaaed9ec3f7c7ceae8c3eb6b92976bb6b13b9a55389a67da4c71897b4a38200b2e833b4f197e738fff17281c3d0f5c7b3f65226 SHA512 5b4dd91f37b2c3212e9c93e7492756e8534f23d85a12af33cae7ce8150fa182286f37e2d4f3ca7369cb13613b24146e1ba0bb5d889db37634e561b0f921be58a diff --git a/sci-electronics/labone/labone-21.08.20515-r1.ebuild b/sci-electronics/labone/labone-21.08.20515-r2.ebuild index 0c0c263143ff..679237f6487e 100644 --- a/sci-electronics/labone/labone-21.08.20515-r1.ebuild +++ b/sci-electronics/labone/labone-21.08.20515-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -83,3 +83,13 @@ src_install() { udev_dorules Installer/udev/55-zhinst.rules } + +pkg_postinst() { + xdg_pkg_postinst + udev_reload +} + +pkg_postrm() { + xdg_pkg_postrm + udev_reload +} diff --git a/sci-electronics/labone/labone-23.02.42414.ebuild b/sci-electronics/labone/labone-23.02.42414.ebuild new file mode 100644 index 000000000000..cecf87806ce5 --- /dev/null +++ b/sci-electronics/labone/labone-23.02.42414.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg desktop systemd udev + +DESCRIPTION="Platform independent instrument control for Zurich Instruments devices" +HOMEPAGE="https://www.zhinst.com/labone" + +# Seriously... +SRC_URI="https://pub-a579c9a7a5ee41a2ba57327584974c85.r2.dev/${PV}/LabOneLinux64-${PV}.tar.gz" + +LICENSE="zi-labone" +SLOT="0" +KEYWORDS="-* ~amd64" +RESTRICT="mirror bindist" +IUSE="minimal" + +QA_PREBUILT="*" + +RDEPEND="" + +S=${WORKDIR}/LabOneLinux64-${PV} + +src_install() { + local application_directory=/opt/zi + local installation_directory="${application_directory}/LabOne64-${PV}" + + if ! use minimal ; then + + # the applications + + dodir ${installation_directory} + for dir in API DataServer Firmware Documentation WebServer ; do + mv "$dir" "${D}${installation_directory}/" || die + done + + cp "release_notes_$(ver_cut 1-2).html" "${D}${installation_directory}/" || die + + dosym ../..${installation_directory}/DataServer/ziServer /opt/bin/ziServer + dosym ../..${installation_directory}/DataServer/ziDataServer /opt/bin/ziDataServer + + # the services + + # LabOne comes with systemd support. + + local service + for service in labone-data-server hf2-data-server ; do + sed -e 's:/usr/local/bin/:/opt/bin/:g' -i Installer/systemd/${service}.service || die + systemd_dounit Installer/systemd/${service}.service + done + + # For OpenRC we need to do our own thing... + + for service in labone-data-server hf2-data-server ; do + doinitd "${FILESDIR}/${service}" + doconfd "${FILESDIR}/${service}.conf" + done + + echo "#!/bin/bash" > "${T}/startziWebServer" || die + echo "${installation_directory}/WebServer/ziWebServer -r ${installation_directory}/WebServer/html --ip 127.0.0.1 --server-port 8004 -a 1" '$@ &' >> "${T}/startziWebServer" || die + chmod 755 "${T}/startziWebServer" || die + exeinto /opt/bin + doexe "${T}/startziWebServer" + elog For security reasons the startziWebServer script listens on the localhost interface only. + + newicon "${D}${installation_directory}/WebServer/html/images/favicons/firefox_app_128x128.png" zi-labone.png + + make_desktop_entry /opt/bin/startziWebServer "ZI LabOne" zi-labone "Science;Physics;Engineering" + + keepdir /var/log/labone + fowners nobody /var/log/labone + else + + insinto "${installation_directory}/API/C/lib" + doins API/C/lib/*.so + insinto "${installation_directory}/API/C/include" + doins API/C/include/*.h + + fi + + dosym "../..${installation_directory}/API/C/include/ziAPI.h" "usr/include/ziAPI.h" + dosym "../..${installation_directory}/API/C/lib/libziAPI-linux64.so" "usr/$(get_libdir)/libziAPI-linux64.so" + + udev_dorules Installer/udev/55-zhinst.rules +} + +pkg_postinst() { + xdg_pkg_postinst + udev_reload +} + +pkg_postrm() { + xdg_pkg_postrm + udev_reload +} diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest index 52fa31a39204..b213eb0e1df5 100644 --- a/sci-electronics/librepcb/Manifest +++ b/sci-electronics/librepcb/Manifest @@ -1,2 +1 @@ -DIST librepcb-0.1.6-source.zip 12671974 BLAKE2B bed8d6134159ec663dd88f9933ef0dad6d3bca70776537bf2e16397f0e4fd968a41661d95a118008fcf9d7d6d2432ebac81d78153b3c3ce8d69c64fb59aaf70e SHA512 a51ac2830d65bbd10be8904ecdcc6a7781d80c95e1423ed5bd04fcd009a0b7135ff3a49a87afe9e99006ae1f6ae44f2341021e5733675f2f20b05525860da5d7 -DIST librepcb-0.1.7-source.zip 13112342 BLAKE2B 53b6dad94febee84b60df1d848936f44093698c9965d4b24815395ff564a5634ab84f38574e7a1b6891f2cdd99b5162eb3747bbfdde2dfc2d680cff76a4e1cc1 SHA512 285ad661b9c528b1aa05c9a0482034af26e9344eb08a119ffabbadf518957a9784ccb9582bcfabcf5bf8982c33b6286b39722c0d59072df983925b3949b3e6c5 +DIST librepcb-1.1.0-source.zip 15373750 BLAKE2B 6f8ba8d66b95373e4760aae617b423e71fcb89ceb39703ce4547a390e4ad0630866632d9bad01f93780fdb8c3452ec0424e753ef891402e440686c64eba56495 SHA512 2ca02095d89547e17813fcfeadedd48fb9345d177885c9d21a8d313d864c6f02243eb13a33341c474bc0671a66ef6b00b6329760aeb3439fdb10123f2db9d38b diff --git a/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch b/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch deleted file mode 100644 index 2abb26b18b59..000000000000 --- a/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/./libs/librepcb/common/utils/mathparser.cpp.orig b/./libs/librepcb/common/utils/mathparser.cpp -index 618de36..e0903de 100644 ---- a/./libs/librepcb/common/utils/mathparser.cpp.orig -+++ b/./libs/librepcb/common/utils/mathparser.cpp -@@ -22,7 +22,7 @@ - ******************************************************************************/ - #include "mathparser.h" - --#include "muparser/include/muParser.h" -+#include <muParser.h> - - /******************************************************************************* - * Namespace -diff --git a/./cmake/FindMuParser.cmake.orig b/./cmake/FindMuParser.cmake ---- a/./cmake/FindMuParser.cmake.orig 2021-11-03 01:04:32.000000000 +0300 -+++ b/./cmake/FindMuParser.cmake 2022-04-24 18:01:23.996260205 +0300 -@@ -37,6 +37,11 @@ - if(muparser_FOUND) - message(STATUS "Using system MuParser") - -+ # Add uppercase alias if only the lowercase target is defined -+ if(NOT TARGET MuParser::MuParser) -+ add_library(MuParser::MuParser ALIAS muparser::muparser) -+ endif() -+ - # Stop here, we're done - return() - endif() diff --git a/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild b/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild deleted file mode 100644 index ff7207a0da95..000000000000 --- a/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2009-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake virtualx xdg - -DESCRIPTION="Free EDA software to develop printed circuit boards" -HOMEPAGE="https://librepcb.org/" -SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=" - app-arch/unzip - dev-qt/linguist-tools:5" - -RDEPEND=" - dev-cpp/muParser:= - dev-libs/quazip:=[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/zlib" - -DEPEND="${RDEPEND} - dev-qt/qttest:5" - -PATCHES=( "${FILESDIR}"/${P}-muparser-fix.patch ) - -src_configure() { - local mycmakeargs+=( - -DUNBUNDLE_QUAZIP=ON - -DUNBUNDLE_MUPARSER=ON ) - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}"/tests/unittests || die - virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername -} diff --git a/sci-electronics/librepcb/librepcb-0.1.7.ebuild b/sci-electronics/librepcb/librepcb-1.1.0-r1.ebuild index c2752d3b0f23..26ffe3cc6261 100644 --- a/sci-electronics/librepcb/librepcb-0.1.7.ebuild +++ b/sci-electronics/librepcb/librepcb-1.1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2009-2022 Gentoo Authors +# Copyright 2009-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,42 +9,64 @@ DESCRIPTION="Free EDA software to develop printed circuit boards" HOMEPAGE="https://librepcb.org/" SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip" +S="${WORKDIR}/${PN}-${PV/_/-}" + LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" +IUSE="opencascade qt6" + BDEPEND=" app-arch/unzip - dev-qt/linguist-tools:5" + !qt6? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] )" RDEPEND=" dev-cpp/muParser:= - dev-libs/quazip:=[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-libs/zlib" + !qt6? ( + dev-libs/quazip:=[qt5(+)] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) + qt6? ( + dev-libs/quazip:=[qt6(-)] + dev-qt/qtbase[concurrent,gui,network,opengl,sql,sqlite,ssl,widgets] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + ) + opencascade? ( sci-libs/opencascade:= ) + media-libs/libglvnd[X] + sys-libs/zlib + virtual/glu" DEPEND="${RDEPEND} - dev-qt/qttest:5" + test? ( dev-cpp/gtest ) + !qt6? ( dev-qt/qttest:5 )" src_configure() { - local mycmakeargs+=( + local mycmakeargs=( + -DBUILD_TESTS=$(usex test ON OFF) + -DQT_MAJOR_VERSION=$(usex qt6 6 5) + -DUNBUNDLE_GTEST=ON + -DUNBUNDLE_MUPARSER=ON -DUNBUNDLE_QUAZIP=ON - -DUNBUNDLE_MUPARSER=ON ) + -DUSE_OPENCASCADE=$(usex opencascade 1 0) ) cmake_src_configure } src_test() { cd "${BUILD_DIR}"/tests/unittests || die # https://github.com/LibrePCB/LibrePCB/issues/516 + # virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername:CategoryTreeModelTest.testSort:BoardPlaneFragmentsBuilderTest.testFragments:BoardGerberExportTest.test } diff --git a/sci-electronics/librepcb/metadata.xml b/sci-electronics/librepcb/metadata.xml index 1daccaad1007..de1b0cf0ff98 100644 --- a/sci-electronics/librepcb/metadata.xml +++ b/sci-electronics/librepcb/metadata.xml @@ -2,20 +2,26 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project" proxied="proxy"> - <email>sci-electronics@gentoo.org</email> - <description>Gentoo Electronics Project</description> + <email>sci-electronics@gentoo.org</email> + <description>Gentoo Electronics Project</description> </maintainer> <maintainer type="person" proxied="yes"> - <email>ktrace@yandex.ru</email> - <name>Victor V. Kustov</name> - </maintainer> - <longdescription lang="en"> - LibrePCB is a free EDA software to develop printed circuit boards. - Cross-platform, multilingual (both application and library elements), intuitive, modern and easy-to-use graphical user interface. + <email>ktrace@yandex.ru</email> + <name>Victor V. Kustov</name> + </maintainer> + <longdescription lang="en"> + LibrePCB is a free EDA software to develop printed circuit boards. + Cross-platform, multilingual (both application and library elements), intuitive, modern and easy-to-use graphical user interface. - All-In-One: project management + library/schematic/board editors - Very powerful library design with some innovative concepts - Human-readable file formats for both libraries and projects - Multi-PCB feature (different PCB variants of the same schematic) - Automatic netlist synchronisation between schematic and board - </longdescription> + </longdescription> + <use> + <flag name="opencascade">Build with <pkg>sci-libs/opencascade</pkg>the 3D features (e.g. reading/writing STEP files)</flag> + </use> + <upstream> + <remote-id type="github">LibrePCB/LibrePCB</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest index 7c77e2332aac..33b5661d4c15 100644 --- a/sci-electronics/magic/Manifest +++ b/sci-electronics/magic/Manifest @@ -1,4 +1,2 @@ -DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b049545dc3b26572f415ba0df3958bc5c3931b686718136185cf105e437fe70dc1f71a11707ad33afac80ddf8f2f SHA512 755b27b8f263d990ca86b3f043e1b8f8a2de75d72f1baf9c4de3a1d7cde28feecf093d8bf1497f2632327d09ce0ce0b17ccea46bdba01c5b53c52ea0f5cf5fdc -DIST magic-8.3.309.tgz 4175194 BLAKE2B dc63e74abf1a0fee75b1b018f58f73f0ed4ba7acb244aa0f427af1d4051a3344892ee8514a5f99827bd10c8ff44eac907a70150855db48fb97d0e4d436273893 SHA512 1abfd843f3d123bf532672c5e8c58d2c0f50e29ab017c21e4895810163eec430ba07c3b0dd8c571e47f1ce3bacfd37aa4cc667e4cecb3d53b3b7dd1c8205d8c2 DIST magic-8.3.365.tgz 4206213 BLAKE2B 2a50843c166f55471db13400c047cc5b32e762ad90cefb170c03874427ebce3452a6f13ff1524897672bbd7418d9ace2366d22fba9641310882f505d3463c19f SHA512 8ac3933ae74f5953dfbcfaaeaddb8fded36aa9fe2e371808c53edb96f758451b7d75fd6c47666ae0624de5dbab335f6a2990427e1135165360ddc5ed8a33954d DIST magic-tech-mosis-2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e diff --git a/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch b/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch deleted file mode 100644 index 8455d7bb1931..000000000000 --- a/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -18,12 +18,10 @@ - all: $(ALL_TARGET) - - standard: -- @echo --- errors and warnings logged in file make.log -- @${MAKE} mains 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)" -+ @${MAKE} mains - - tcl: -- @echo --- errors and warnings logged in file make.log -- @${MAKE} tcllibrary 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)" -+ @${MAKE} tcllibrary - - force: clean all - -@@ -68,7 +66,7 @@ - install-magic: - @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR} - @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR} -- @${MAKE} install-real 2>&1 >> install.log -+ @${MAKE} install-real - - install-real: install-dirs - for dir in ${INSTALL_CAD_DIRS}; do \ -@@ -89,7 +87,7 @@ - install-tcl: - @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR} - @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR} -- @${MAKE} install-tcl-real 2>&1 >> install.log -+ @${MAKE} install-tcl-real - - install-tcl-real: install-tcl-dirs - for dir in ${INSTALL_CAD_DIRS} ${PROGRAMS}; do \ diff --git a/sci-electronics/magic/magic-8.3.232-r1.ebuild b/sci-electronics/magic/magic-8.3.232-r1.ebuild deleted file mode 100644 index d3876aa9ad6e..000000000000 --- a/sci-electronics/magic/magic-8.3.232-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TECH_MOSIS_VER="2002a" - -DESCRIPTION="The VLSI design CAD tool" -HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html" -SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz - http://opencircuitdesign.com/~tim/programs/${PN}/archive/${TECH_MOSIS_VER}.tar.gz \ - -> ${PN}-tech-mosis-${TECH_MOSIS_VER}.tar.gz" - -LICENSE="HPND GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="cairo debug opengl" - -RDEPEND="sys-libs/ncurses:0= - sys-libs/readline:0= - dev-lang/tcl:0= - dev-lang/tk:0= - dev-tcltk/blt - cairo? ( x11-libs/cairo ) - opengl? ( - virtual/glu - virtual/opengl - )" -DEPEND="${RDEPEND}" -BDEPEND="app-shells/tcsh" - -PATCHES=( - "${FILESDIR}"/${PN}-8.3.232-libdir.patch - "${FILESDIR}"/${PN}-8.3.232-verbose-build.patch -) - -DOCS=( README.md README.Tcl TODO ) - -src_prepare() { - default - - pushd scripts &>/dev/null || die - mv configure.in configure.ac || die - popd &>/dev/null || die - - sed -i -e "s: -pg : :" tcltk/Makefile || die - - # required for >=autoconf-2.70 (bug #775422) - local ac_aux_file - for ac_aux_file in install-sh config.guess config.sub ; do - ln -s scripts/${ac_aux_file} ${ac_aux_file} || die - done -} - -src_configure() { - # Short-circuit top-level configure script to retain CFLAGS - # fix tcl/tk detection #447868 - cd scripts || die - econf \ - --with-tcl=yes \ - --with-tcllibs="/usr/$(get_libdir)" \ - --with-tklibs="/usr/$(get_libdir)" \ - --disable-modular \ - $(use_enable debug memdebug) \ - $(use_enable cairo cairo-offscreen) \ - $(use_with opengl) -} - -src_install() { - default - - # Move docs from libdir to docdir and add symlink. - mv "${ED}/usr/$(get_libdir)/magic/doc"/* "${ED}/usr/share/doc/${PF}/" || die - rmdir "${ED}/usr/$(get_libdir)/magic/doc" || die - dosym -r "${EPREFIX}/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" - - # Move tutorial from libdir to datadir and add symlink. - dodir /usr/share/${PN} - mv "${ED}/usr/$(get_libdir)/magic/tutorial" "${ED}/usr/share/${PN}/" || die - dosym -r "${EPREFIX}/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" - - # Install latest MOSIS tech files - cp -pPR "${WORKDIR}"/${TECH_MOSIS_VER} "${ED}"/usr/$(get_libdir)/magic/sys/current || die -} diff --git a/sci-electronics/magic/magic-8.3.309-r2.ebuild b/sci-electronics/magic/magic-8.3.309-r2.ebuild deleted file mode 100644 index b615a42ae11d..000000000000 --- a/sci-electronics/magic/magic-8.3.309-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 - -TECH_MOSIS_VER="2002a" - -DESCRIPTION="The VLSI design CAD tool" -HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html" -SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz - http://opencircuitdesign.com/~tim/programs/${PN}/archive/${TECH_MOSIS_VER}.tar.gz \ - -> ${PN}-tech-mosis-${TECH_MOSIS_VER}.tar.gz" - -LICENSE="HPND GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="cairo debug opengl" - -RDEPEND=" - sys-libs/ncurses:0= - sys-libs/readline:0= - sys-libs/zlib:= - dev-lang/tcl:0= - dev-lang/tk:0= - dev-tcltk/blt - cairo? ( x11-libs/cairo ) - opengl? ( - virtual/glu - virtual/opengl - ) -" -DEPEND="${RDEPEND}" -BDEPEND="app-shells/tcsh - ${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/${PN}-8.3.232-libdir.patch -) - -DOCS=( README.md README.Tcl TODO ) - -src_prepare() { - default - - pushd scripts &>/dev/null || die - mv configure.in configure.ac || die - popd &>/dev/null || die - - # required for >=autoconf-2.70 (bug #775422) - local ac_aux_file - for ac_aux_file in install-sh config.guess config.sub ; do - ln -s scripts/${ac_aux_file} ${ac_aux_file} || die - done -} - -src_configure() { - # Short-circuit top-level configure script to retain CFLAGS - # Fix tcl/tk detection, bug #447868 - cd scripts || die - econf \ - --with-tcl="/usr/$(get_libdir)" \ - --with-tk="/usr/$(get_libdir)" \ - --with-tcllibs="/usr/$(get_libdir)" \ - --with-tklibs="/usr/$(get_libdir)" \ - --disable-modular \ - $(use_enable debug memdebug) \ - $(use_enable cairo cairo-offscreen) \ - $(use_with opengl) -} - -src_install() { - # Make does not always install required .tech files with parallel make install - emake DESTDIR="${ED}" install -j1 - einstalldocs - - # Move docs from libdir to docdir and add symlink. - mv "${ED}/usr/$(get_libdir)/magic/doc"/* "${ED}/usr/share/doc/${PF}/" || die - rmdir "${ED}/usr/$(get_libdir)/magic/doc" || die - dosym -r "${EPREFIX}/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" - - # Move tutorial from libdir to datadir and add symlink. - dodir /usr/share/${PN} - mv "${ED}/usr/$(get_libdir)/magic/tutorial" "${ED}/usr/share/${PN}/" || die - dosym -r "${EPREFIX}/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" - - # Install latest MOSIS tech files - cp -pPR "${WORKDIR}"/${TECH_MOSIS_VER} "${ED}"/usr/$(get_libdir)/magic/sys/current || die -} diff --git a/sci-electronics/magic/magic-8.3.309-r3.ebuild b/sci-electronics/magic/magic-8.3.309-r3.ebuild deleted file mode 100644 index 1b40c505933c..000000000000 --- a/sci-electronics/magic/magic-8.3.309-r3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-any-r1 - -TECH_MOSIS_VER="2002a" - -DESCRIPTION="The VLSI design CAD tool" -HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html" -SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz - http://opencircuitdesign.com/~tim/programs/${PN}/archive/${TECH_MOSIS_VER}.tar.gz \ - -> ${PN}-tech-mosis-${TECH_MOSIS_VER}.tar.gz" - -LICENSE="HPND GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="cairo debug opengl" - -RDEPEND=" - sys-libs/ncurses:0= - sys-libs/readline:0= - sys-libs/zlib:= - dev-lang/tcl:0= - dev-lang/tk:0= - dev-tcltk/blt - cairo? ( x11-libs/cairo ) - opengl? ( - virtual/glu - virtual/opengl - ) -" -DEPEND="${RDEPEND}" -BDEPEND="app-shells/tcsh - ${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/${PN}-8.3.232-libdir.patch -) - -DOCS=( README.md README.Tcl TODO ) - -src_prepare() { - default - - # Don't embed MAGIC_COMMIT - sed -i 's/git rev-parse HEAD//' scripts/defs.mak.in || die - - pushd scripts &>/dev/null || die - mv configure.in configure.ac || die - popd &>/dev/null || die - - # required for >=autoconf-2.70 (bug #775422) - local ac_aux_file - for ac_aux_file in install-sh config.guess config.sub ; do - ln -s scripts/${ac_aux_file} ${ac_aux_file} || die - done -} - -src_configure() { - # Short-circuit top-level configure script to retain CFLAGS - # Fix tcl/tk detection, bug #447868 - cd scripts || die - econf \ - --with-tcl="/usr/$(get_libdir)" \ - --with-tk="/usr/$(get_libdir)" \ - --with-tcllibs="/usr/$(get_libdir)" \ - --with-tklibs="/usr/$(get_libdir)" \ - --disable-modular \ - $(use_enable debug memdebug) \ - $(use_enable cairo cairo-offscreen) \ - $(use_with cairo) \ - $(use_with opengl) -} - -src_install() { - # Make does not always install required .tech files with parallel make install - emake DESTDIR="${ED}" install -j1 - einstalldocs - - # Move docs from libdir to docdir and add symlink. - mv "${ED}/usr/$(get_libdir)/magic/doc"/* "${ED}/usr/share/doc/${PF}/" || die - rmdir "${ED}/usr/$(get_libdir)/magic/doc" || die - dosym -r "${EPREFIX}/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" - - # Move tutorial from libdir to datadir and add symlink. - dodir /usr/share/${PN} - mv "${ED}/usr/$(get_libdir)/magic/tutorial" "${ED}/usr/share/${PN}/" || die - dosym -r "${EPREFIX}/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" - - # Install latest MOSIS tech files - cp -pPR "${WORKDIR}"/${TECH_MOSIS_VER} "${ED}"/usr/$(get_libdir)/magic/sys/current || die -} diff --git a/sci-electronics/magic/magic-8.3.365.ebuild b/sci-electronics/magic/magic-8.3.365.ebuild index feb879ad8924..a2e076e9dd0b 100644 --- a/sci-electronics/magic/magic-8.3.365.ebuild +++ b/sci-electronics/magic/magic-8.3.365.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 @@ -17,7 +17,7 @@ SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz LICENSE="HPND GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="cairo debug opengl" # https://bugs.gentoo.org/887691 diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest index e926f3309624..f93ca63dcb21 100644 --- a/sci-electronics/ngspice/Manifest +++ b/sci-electronics/ngspice/Manifest @@ -1,8 +1,4 @@ -DIST ngspice-31-manual.pdf 2149244 BLAKE2B 155f7299cbb6d7c7953d8488e11f0bffc3c18097f02194c491174a9af387cda9e87cb79b13a37f402616386e7e82230eb4d41909fe37d900792e48f2f49c71dd SHA512 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55 -DIST ngspice-31.tar.gz 7250057 BLAKE2B dabc8e1084eba957d6dad06e74f878b51e97dc8bc49b04ee612a6f9eaadde7302450c9ab93e943c4af42197b6bbdca7cae534464ccd2fcd4869b8a48b6f3140d SHA512 448024f398d267911d5d2a48da03eb0d87ba1133ce39d5132bd318dde8ad359d19c7f85f6b4ec88c08b081c9140f7b931334d84173019a22aa2ac98482bd7d5d -DIST ngspice-34-manual.pdf 2311221 BLAKE2B e8863bab8173980a825970b90b685d3d5a59768a2110d00dc3fb3dbd504cd94390b13bf3ac8821ca22561cb390c0d7331d8eaa8e47020592b3526895f6d398d0 SHA512 b53f9161b793223015a307ba607add4e540ad22f252c2f6e3c6deedfc3fde173ec290bbc4939d4e419321cad6a68218f6a9c9b4c7620ee01da86eabfc22e5b7e -DIST ngspice-34.tar.gz 7800546 BLAKE2B a07a7266225b8c4e478e3240718aa1fce9a77003d58477a30a6178368e7826f288007f9111797ca1c426486911d4bedd847bdf0daa69232e59333304468a4fc3 SHA512 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8 -DIST ngspice-35-manual.pdf 2347261 BLAKE2B 617462615525e5335f5795e625578324d2b173a8d69438e43c4007177e7ca0fdf8d37b1553a4c836a352523c310bbf23ef492a01ac0a7541ca8ac0794b588a66 SHA512 df3239c4798746534d12a489d80056d45d9f3cda60336aaeb2dd541526340715a180780b0e2ced1857e9c5cbe716c4b3f0c496598f8a3e8aa36a8cd1b6a022c7 -DIST ngspice-35.tar.gz 8050668 BLAKE2B d67475b55e1e14974a78451175a08ec91be24708030e0da8fa6811b7df880c8082741ec08d92c314c53480271cc074e35ad0eca27a3b7601e33fb240c834e530 SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b DIST ngspice-36-manual.pdf 2397103 BLAKE2B 09dbfe4101b8e1752509caa37ba3a323da7d7391488c3245b3f614114d1666ee32ea1391ad4f39772ed950e270f028b7513115e0c13fde052bfdb5674f021b3b SHA512 bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 DIST ngspice-36.tar.gz 8450071 BLAKE2B 51fa2c5998e96a05deb3764f56659ed0970d6362fcbec7367b04a5fbe76fc7dadb08e0d36b660b0e1f8e525079bedf71305877ab2de8e2ab2773c891808fb5a6 SHA512 d862097f465e92986e8d6644374d43249eebee0fb6d79b1404dbb7c11d14a058dfedd4bdb61baf5aa1ffd1d2e71167440db73eb417d4b1249a0a7b83bd39efc3 +DIST ngspice-40-manual.pdf 2462604 BLAKE2B a0d680cd76f8acb1be18e94953d70784aaf79e1bcc4bc3995a1221d81e27c13e577d182e7cbacb8430a068db7d86681f22ec4f3537b5704faacb8e982588617f SHA512 1a5c7828aa9a4554052fb01145641415d8a4cbd50db9885d5d937e1b6f50c7c541dfeeabf2efd6ea862036b4d74ce8265bdac1cfad0fc635f28651a0d397bfc5 +DIST ngspice-40.tar.gz 9431981 BLAKE2B e45d5d7a9e8d9d3fdae4eb076090a588680055a74cc24ba9ca3d93a7c42b95ee29073101d5791f8069cb27b3049aa1a451476f1df6460477fb156336602678fd SHA512 dab422cc8677e6f4bb92e06be0ce695a53d3e9abbe533c7bb91540d55d2a13514b0b166c8ccafcc17699799a846a35e260dddc400664c6e1137e1b18504e9954 diff --git a/sci-electronics/ngspice/ngspice-31-r1.ebuild b/sci-electronics/ngspice/ngspice-31-r1.ebuild deleted file mode 100644 index 603365b18c66..000000000000 --- a/sci-electronics/ngspice/ngspice-31-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multibuild toolchain-funcs virtualx - -DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)" -SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz - doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )" -HOMEPAGE="http://ngspice.sourceforge.net" -LICENSE="BSD GPL-2" - -SLOT="0" -IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl" -RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~x64-macos" - -DEPEND="sys-libs/ncurses:0= - X? ( x11-libs/libXaw - x11-libs/libXt - x11-libs/libX11 ) - fftw? ( sci-libs/fftw:3.0 ) - readline? ( sys-libs/readline:0= ) - tcl? ( dev-lang/tcl:0 - dev-tcltk/blt )" -RDEPEND="${DEPEND} - X? ( sci-visualization/xgraph )" - -DOCS=( - ANALYSES - AUTHORS - BUGS - ChangeLog - DEVICES - FAQ - NEWS - README - README.vdmos - Stuarts_Poly_Notes -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - MULTIBUILD_VARIANTS=( "binaries" ) - use shared && MULTIBUILD_VARIANTS+=( "shared" ) - use tcl && MULTIBUILD_VARIANTS+=( "tcl" ) -} - -src_prepare() { - default - - if use tcl; then - if use examples; then - find examples/tclspice -type f -iname \*tcl -or -iname \*.sh | - while read s - do - sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \ - -e 's@package require BLT@package require Tk\npackage require BLT@g' \ - -e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \ - "${s}" || die "sed failed" - done - fi - fi - - eautoreconf - multibuild_copy_sources -} - -src_configure() { - multibuild_foreach_variant ngspice_configure -} - -ngspice_configure() { - local myeconfargs - - pushd "${BUILD_DIR}" &>/dev/null || die - - if use debug; then - myeconfargs=( - --enable-debug - --enable-ftedebug - --enable-cpdebug - --enable-sensdebug - --enable-asdebug - --enable-stepdebug - --enable-pzdebug - ) - else - myeconfargs=( - --disable-debug - --disable-ftedebug - --disable-cpdebug - --disable-sensdebug - --disable-asdebug - --disable-stepdebug - --disable-pzdebug - ) - fi - - # As of December 2017, these do not compile - myeconfargs+=( - --disable-blktmsdebug - --disable-smltmsdebug - ) - - myeconfargs+=( - --enable-xspice - --enable-cider - --disable-rpath - $(use_enable openmp) - $(use_with fftw fftw3) - $(use_with readline) - ) - - if [[ "${MULTIBUILD_VARIANT}" == "shared" ]]; then - myeconfargs+=( --with-ngshared ) - elif [[ "${MULTIBUILD_VARIANT}" == "tcl" ]]; then - myeconfargs+=( --with-tcl="${EPREFIX}/usr/$(get_libdir)" ) - else - myeconfargs+=( - $(use_enable deprecated oldapps) - $(use_with X x) - ) - fi - - econf "${myeconfargs[@]}" - - popd &>/dev/null || die -} - -src_compile() { - multibuild_foreach_variant ngspice_compile -} - -ngspice_compile() { - pushd "${BUILD_DIR}" &>/dev/null || die - default - popd &>/dev/null || die -} - -src_install() { - multibuild_foreach_variant ngspice_install - - # merge the installations of all variants - local v - for v in "${MULTIBUILD_VARIANTS[@]}" ; do - cp -a "${ED}/tmp/${v}"/* "${ED}" || die "Failed to combine multibuild installations" - done - rm -rf "${ED}/tmp" || die - - use tcl && DOCS+=( README.tcl ) - use shared && DOCS+=( README.shared-xspice ) - use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf ) - - default - - if use examples; then - if ! use tcl; then - rm -rf examples/tclspice || die - fi - - insinto /usr/share/${PN} - doins -r examples - fi -} - -ngspice_install() { - pushd "${BUILD_DIR}" &>/dev/null || die - - emake DESTDIR="${ED}/tmp/${MULTIBUILD_VARIANT}" install - - # Strip shared-library and Tcl-module builds to the bare minimum; - # all the support files will have been handled by the 'binaries' build. - if [[ "${MULTIBUILD_VARIANT}" != "binaries" ]]; then - rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/bin{,.debug} || die - rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/share || die - rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la || die - rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug} || die - fi - - popd &>/dev/null || die -} - -src_test() { - if ! use debug; then - # tests can be only executed for the binaries variant - pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die - virtx default - popd &>/dev/null || die - else - # https://sourceforge.net/p/ngspice/bugs/353/ - ewarn - ewarn "Skipping tests because they are known to fail in debug mode" - ewarn - fi -} diff --git a/sci-electronics/ngspice/ngspice-34.ebuild b/sci-electronics/ngspice/ngspice-34.ebuild deleted file mode 100644 index e0f41dc5b269..000000000000 --- a/sci-electronics/ngspice/ngspice-34.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multibuild toolchain-funcs virtualx - -DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)" -SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz - doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )" -HOMEPAGE="http://ngspice.sourceforge.net" -LICENSE="BSD GPL-2" - -SLOT="0" -IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl" -KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~x64-macos" - -RESTRICT="!test? ( test )" - -DEPEND="sys-libs/ncurses:0= - X? ( x11-libs/libXaw - x11-libs/libXt - x11-libs/libX11 ) - fftw? ( sci-libs/fftw:3.0 ) - readline? ( sys-libs/readline:0= ) - tcl? ( dev-lang/tcl:0 - dev-tcltk/blt )" -RDEPEND="${DEPEND} - X? ( sci-visualization/xgraph )" - -DOCS=( - ANALYSES - AUTHORS - BUGS - ChangeLog - DEVICES - FAQ - NEWS - README - README.vdmos - Stuarts_Poly_Notes -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - MULTIBUILD_VARIANTS=( "binaries" ) - use shared && MULTIBUILD_VARIANTS+=( "shared" ) - use tcl && MULTIBUILD_VARIANTS+=( "tcl" ) -} - -src_prepare() { - default - - if use tcl; then - if use examples; then - find examples/tclspice -type f -iname \*tcl -or -iname \*.sh | - while read s - do - sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \ - -e 's@package require BLT@package require Tk\npackage require BLT@g' \ - -e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \ - "${s}" || die "sed failed" - done - fi - fi - - eautoreconf - multibuild_copy_sources -} - -src_configure() { - multibuild_foreach_variant ngspice_configure -} - -ngspice_configure() { - local myeconfargs - - pushd "${BUILD_DIR}" &>/dev/null || die - - if use debug; then - myeconfargs=( - --enable-debug - --enable-ftedebug - --enable-cpdebug - --enable-sensdebug - --enable-asdebug - --enable-stepdebug - --enable-pzdebug - ) - else - myeconfargs=( - --disable-debug - --disable-ftedebug - --disable-cpdebug - --disable-sensdebug - --disable-asdebug - --disable-stepdebug - --disable-pzdebug - ) - fi - - # As of March 2021, these do not compile - myeconfargs+=( - --disable-blktmsdebug - --disable-smltmsdebug - ) - - myeconfargs+=( - --enable-xspice - --enable-cider - --disable-rpath - $(use_enable openmp) - $(use_with fftw fftw3) - $(use_with readline) - ) - - if [[ "${MULTIBUILD_VARIANT}" == "shared" ]]; then - myeconfargs+=( --with-ngshared ) - elif [[ "${MULTIBUILD_VARIANT}" == "tcl" ]]; then - myeconfargs+=( --with-tcl="${EPREFIX}/usr/$(get_libdir)" ) - else - myeconfargs+=( - $(use_enable deprecated oldapps) - $(use_with X x) - ) - fi - - econf "${myeconfargs[@]}" - - popd &>/dev/null || die -} - -src_compile() { - multibuild_foreach_variant ngspice_compile -} - -ngspice_compile() { - pushd "${BUILD_DIR}" &>/dev/null || die - default - popd &>/dev/null || die -} - -src_install() { - multibuild_foreach_variant ngspice_install - - # merge the installations of all variants - local v - for v in "${MULTIBUILD_VARIANTS[@]}" ; do - cp -a "${ED}/tmp/${v}"/* "${ED}" || die "Failed to combine multibuild installations" - done - rm -rf "${ED}/tmp" || die - - use tcl && DOCS+=( README.tcl ) - use shared && DOCS+=( README.shared-xspice ) - use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf ) - - default - - if use examples; then - if ! use tcl; then - rm -rf examples/tclspice || die - fi - - insinto /usr/share/${PN} - doins -r examples - fi -} - -ngspice_install() { - pushd "${BUILD_DIR}" &>/dev/null || die - - emake DESTDIR="${ED}/tmp/${MULTIBUILD_VARIANT}" install - - # Strip shared-library and Tcl-module builds to the bare minimum; - # all the support files will have been handled by the 'binaries' build. - if [[ "${MULTIBUILD_VARIANT}" != "binaries" ]]; then - rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/bin{,.debug} || die - rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/share || die - rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la || die - rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug} || die - fi - - popd &>/dev/null || die -} - -src_test() { - if ! use debug; then - # tests can be only executed for the binaries variant - pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die - echo "set ngbehavior=mc" > "${HOME}"/.spiceinit || die "Failed to configure ${PN} for running the test suite" - virtx default - popd &>/dev/null || die - else - # https://sourceforge.net/p/ngspice/bugs/353/ - ewarn - ewarn "Skipping tests because they are known to fail in debug mode" - ewarn - fi -} diff --git a/sci-electronics/ngspice/ngspice-36.ebuild b/sci-electronics/ngspice/ngspice-36.ebuild index 254b93c83e34..6a99a86b05e4 100644 --- a/sci-electronics/ngspice/ngspice-36.ebuild +++ b/sci-electronics/ngspice/ngspice-36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,14 +6,14 @@ EAPI=7 inherit autotools multibuild toolchain-funcs virtualx DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)" -SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz - doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )" +SRC_URI="https://downloads.sourceforge.net/ngspice/${P}.tar.gz + doc? ( https://downloads.sourceforge.net/ngspice/${P}-manual.pdf )" HOMEPAGE="http://ngspice.sourceforge.net" LICENSE="BSD GPL-2" SLOT="0" IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl" -KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~sparc x86 ~x64-macos" +KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos" RESTRICT="!test? ( test )" diff --git a/sci-electronics/ngspice/ngspice-35.ebuild b/sci-electronics/ngspice/ngspice-40.ebuild index 305f2906fb38..c06bd1110fc8 100644 --- a/sci-electronics/ngspice/ngspice-35.ebuild +++ b/sci-electronics/ngspice/ngspice-40.ebuild @@ -1,30 +1,37 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multibuild toolchain-funcs virtualx +inherit autotools flag-o-matic multibuild toolchain-funcs virtualx DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)" -SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz - doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )" HOMEPAGE="http://ngspice.sourceforge.net" -LICENSE="BSD GPL-2" +SRC_URI=" + https://downloads.sourceforge.net/ngspice/${P}.tar.gz + doc? ( https://downloads.sourceforge.net/ngspice/${P}-manual.pdf ) +" +LICENSE="BSD GPL-2 MPL-2.0" SLOT="0" IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl" -KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~x64-macos" - +KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos" RESTRICT="!test? ( test )" -DEPEND="sys-libs/ncurses:0= - X? ( x11-libs/libXaw +DEPEND=" + sys-libs/ncurses:= + X? ( + x11-libs/libXaw x11-libs/libXt - x11-libs/libX11 ) - fftw? ( sci-libs/fftw:3.0 ) - readline? ( sys-libs/readline:0= ) - tcl? ( dev-lang/tcl:0 - dev-tcltk/blt )" + x11-libs/libX11 + ) + fftw? ( sci-libs/fftw:3.0= ) + readline? ( sys-libs/readline:= ) + tcl? ( + dev-lang/tcl:= + dev-tcltk/blt + ) +" RDEPEND="${DEPEND}" DOCS=( @@ -73,6 +80,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862513 + # https://sourceforge.net/p/ngspice/bugs/665/ + filter-lto + multibuild_foreach_variant ngspice_configure } @@ -144,6 +156,21 @@ ngspice_compile() { popd &>/dev/null || die } +src_test() { + if ! use debug; then + # tests can be only executed for the binaries variant + pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die + echo "set ngbehavior=mc" > "${HOME}"/.spiceinit || die "Failed to configure ${PN} for running the test suite" + virtx default + popd &>/dev/null || die + else + # https://sourceforge.net/p/ngspice/bugs/353/ + ewarn + ewarn "Skipping tests because they are known to fail in debug mode" + ewarn + fi +} + src_install() { multibuild_foreach_variant ngspice_install @@ -186,18 +213,3 @@ ngspice_install() { popd &>/dev/null || die } - -src_test() { - if ! use debug; then - # tests can be only executed for the binaries variant - pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die - echo "set ngbehavior=mc" > "${HOME}"/.spiceinit || die "Failed to configure ${PN} for running the test suite" - virtx default - popd &>/dev/null || die - else - # https://sourceforge.net/p/ngspice/bugs/353/ - ewarn - ewarn "Skipping tests because they are known to fail in debug mode" - ewarn - fi -} diff --git a/sci-electronics/nvc/Manifest b/sci-electronics/nvc/Manifest new file mode 100644 index 000000000000..5108a188c853 --- /dev/null +++ b/sci-electronics/nvc/Manifest @@ -0,0 +1,2 @@ +DIST nvc-1.13.2.tar.gz 1960586 BLAKE2B 6cd7a362690be61ef9fa16bf59cc03ffa6abcc95d6e8fa28e3f5b80e732a61a6507f6fd8569111dfdd961c924adb06856b351c33140c5d989e0e8d461a081f84 SHA512 8d81949bbf8b89475ffec5729b9009203fef0c2116be4ce644dc2dc1d3ebb3158dc597f2dc7a9ac8f5fb9c5114ea01403a787964c3820091731942d95beb35bf +DIST nvc-1.13.3.tar.gz 1963182 BLAKE2B c03cb06b8e94e6d5c139ec4da17d6665cb5ce899fabe0ffe60459681aad329ddf9ac6ad9082515e3be76fd32aad56a6c0c89c02c0f22a55ea15a8a3a9e61e763 SHA512 c65904762081429660998f59ec25fbbdc8084a7472be06bad99e42457f5eca5516a65f472a8960cbd9dc0b0a6f5ccfa0d6a8b3d238805ab0120c046bbe56ff3b diff --git a/sci-electronics/nvc/files/nvc-1.9.2-jit-code-capstone.patch b/sci-electronics/nvc/files/nvc-1.9.2-jit-code-capstone.patch new file mode 100644 index 000000000000..963226b34c6d --- /dev/null +++ b/sci-electronics/nvc/files/nvc-1.9.2-jit-code-capstone.patch @@ -0,0 +1,11 @@ +--- a/src/jit/jit-code.c ++++ b/src/jit/jit-code.c +@@ -44,7 +44,7 @@ + #endif + + #ifdef HAVE_CAPSTONE +-#include <capstone.h> ++#include <capstone/capstone.h> + #endif + + #ifndef R_AARCH64_MOVW_UABS_G0_NC diff --git a/sci-electronics/nvc/metadata.xml b/sci-electronics/nvc/metadata.xml new file mode 100644 index 000000000000..30ee43a4d80a --- /dev/null +++ b/sci-electronics/nvc/metadata.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <longdescription> + NVC is a VHDL compiler and simulator. NVC supports almost all of VHDL-2008 + with the exception of PSL, and it has been successfully used to simulate + several real-world designs. Experimental support for VHDL-2019 is under + development. NVC has a particular emphasis on simulation performance and + uses LLVM to compile VHDL to native machine code. NVC is not a synthesizer. + That is, it does not output something that could be used to program an FPGA + or ASIC. It implements only the simulation behaviour of the language as + described by the IEEE 1076 standard. NVC supports popular verification + frameworks including OSVVM, UVVM, and VUnit. + </longdescription> + <use> + <flag name="llvm">Build LLVM code generator</flag> + </use> + <upstream> + <bugs-to>https://github.com/nickg/nvc/issues/</bugs-to> + <remote-id type="github">nickg/nvc</remote-id> + <remote-id type="sourcehut">~nickg/nvc</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-electronics/nvc/nvc-1.13.2.ebuild b/sci-electronics/nvc/nvc-1.13.2.ebuild new file mode 100644 index 000000000000..7beab1f0813a --- /dev/null +++ b/sci-electronics/nvc/nvc-1.13.2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {17..18} ) + +inherit autotools bash-completion-r1 llvm-r1 + +DESCRIPTION="NVC is a VHDL compiler and simulator" +HOMEPAGE="https://www.nickg.me.uk/nvc/ + https://github.com/nickg/nvc/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nickg/nvc.git" + + NVC_SOURCEDIR="${WORKDIR}/${PN}-${PV}" +else + SRC_URI="https://github.com/nickg/nvc/archive/r${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + + NVC_SOURCEDIR="${WORKDIR}/${PN}-r${PV}" +fi + +NVC_BUILDDIR="${NVC_SOURCEDIR}_BuildDir" +S="${NVC_BUILDDIR}" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="debug llvm" +RESTRICT="test" # Some tests fail. + +RDEPEND=" + app-arch/bzip2:= + app-arch/zstd:= + dev-libs/capstone:= + dev-libs/elfutils + dev-libs/icu:= + dev-libs/libffi:= + dev-libs/libxml2:= + sys-libs/ncurses:= + sys-libs/zlib:= + llvm? ( + $(llvm_gen_dep ' + sys-devel/llvm:${LLVM_SLOT}= + ') + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-libs/check + sys-devel/bison + sys-devel/flex +" + +PATCHES=( "${FILESDIR}/nvc-1.9.2-jit-code-capstone.patch" ) + +# Special libraries for NVC. +QA_FLAGS_IGNORED="usr/lib[0-9]*/nvc/preload[0-9]*.so" + +pkg_setup() { + use llvm && llvm-r1_pkg_setup +} + +src_unpack() { + default + + mkdir -p "${S}" || die +} + +src_prepare() { + pushd "${NVC_SOURCEDIR}" >/dev/null || die + + default + eautoreconf + + popd >/dev/null || die +} + +src_configure() { + # Needs "bison" and "flex" exactly. + unset LEX + unset YACC + + local ECONF_SOURCE="${NVC_SOURCEDIR}" + local -a myconf=( + --enable-verilog + --enable-vital + --with-bash-completion="$(get_bashcompdir)" + $(use_enable debug) + $(use_enable llvm) + ) + econf "${myconf[@]}" + + export V=1 # Verbose compilation and install. +} + +src_compile() { + emake -j1 +} + +src_test() { + PATH="${S}/bin:${PATH}" emake check-TESTS +} + +src_install() { + default + + mv "${D}/$(get_bashcompdir)"/nvc{.bash,} || die + dostrip -x "/usr/$(get_libdir)/nvc" +} diff --git a/sci-electronics/nvc/nvc-1.13.3.ebuild b/sci-electronics/nvc/nvc-1.13.3.ebuild new file mode 100644 index 000000000000..7beab1f0813a --- /dev/null +++ b/sci-electronics/nvc/nvc-1.13.3.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {17..18} ) + +inherit autotools bash-completion-r1 llvm-r1 + +DESCRIPTION="NVC is a VHDL compiler and simulator" +HOMEPAGE="https://www.nickg.me.uk/nvc/ + https://github.com/nickg/nvc/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nickg/nvc.git" + + NVC_SOURCEDIR="${WORKDIR}/${PN}-${PV}" +else + SRC_URI="https://github.com/nickg/nvc/archive/r${PV}.tar.gz + -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + + NVC_SOURCEDIR="${WORKDIR}/${PN}-r${PV}" +fi + +NVC_BUILDDIR="${NVC_SOURCEDIR}_BuildDir" +S="${NVC_BUILDDIR}" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="debug llvm" +RESTRICT="test" # Some tests fail. + +RDEPEND=" + app-arch/bzip2:= + app-arch/zstd:= + dev-libs/capstone:= + dev-libs/elfutils + dev-libs/icu:= + dev-libs/libffi:= + dev-libs/libxml2:= + sys-libs/ncurses:= + sys-libs/zlib:= + llvm? ( + $(llvm_gen_dep ' + sys-devel/llvm:${LLVM_SLOT}= + ') + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-libs/check + sys-devel/bison + sys-devel/flex +" + +PATCHES=( "${FILESDIR}/nvc-1.9.2-jit-code-capstone.patch" ) + +# Special libraries for NVC. +QA_FLAGS_IGNORED="usr/lib[0-9]*/nvc/preload[0-9]*.so" + +pkg_setup() { + use llvm && llvm-r1_pkg_setup +} + +src_unpack() { + default + + mkdir -p "${S}" || die +} + +src_prepare() { + pushd "${NVC_SOURCEDIR}" >/dev/null || die + + default + eautoreconf + + popd >/dev/null || die +} + +src_configure() { + # Needs "bison" and "flex" exactly. + unset LEX + unset YACC + + local ECONF_SOURCE="${NVC_SOURCEDIR}" + local -a myconf=( + --enable-verilog + --enable-vital + --with-bash-completion="$(get_bashcompdir)" + $(use_enable debug) + $(use_enable llvm) + ) + econf "${myconf[@]}" + + export V=1 # Verbose compilation and install. +} + +src_compile() { + emake -j1 +} + +src_test() { + PATH="${S}/bin:${PATH}" emake check-TESTS +} + +src_install() { + default + + mv "${D}/$(get_bashcompdir)"/nvc{.bash,} || die + dostrip -x "/usr/$(get_libdir)/nvc" +} diff --git a/sci-electronics/pcb/pcb-4.2.2.ebuild b/sci-electronics/pcb/pcb-4.2.2.ebuild index b51e7ef4e3cd..ae701d9c3c28 100644 --- a/sci-electronics/pcb/pcb-4.2.2.ebuild +++ b/sci-electronics/pcb/pcb-4.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit autotools toolchain-funcs xdg DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor" HOMEPAGE="http://pcb.geda-project.org/" -SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/pcb/pcb/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="dbus doc gcode gif gsvit gui jpeg m4lib-png nelma png test tk toporouter" # toporouter-output USE flag removed, there seems to be no result RESTRICT="!test? ( test )" diff --git a/sci-electronics/pcb/pcb-4.3.0.ebuild b/sci-electronics/pcb/pcb-4.3.0.ebuild index 80f27c1fb2ba..d4b4fe2af37a 100644 --- a/sci-electronics/pcb/pcb-4.3.0.ebuild +++ b/sci-electronics/pcb/pcb-4.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs virtualx xdg DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor" HOMEPAGE="http://pcb.geda-project.org/" -SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/pcb/pcb/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/sci-electronics/puff/puff-20100127-r1.ebuild b/sci-electronics/puff/puff-20100127-r1.ebuild index 3ec8bccda1fa..1c2f5621d272 100644 --- a/sci-electronics/puff/puff-20100127-r1.ebuild +++ b/sci-electronics/puff/puff-20100127-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="microwave CAD software" -HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/" -SRC_URI="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}/${P}.tgz" +HOMEPAGE="https://www.pa3fwm.nl/software/puff/" +SRC_URI="https://www.pa3fwm.nl/software/${PN}/${P}.tgz" LICENSE="GPL-3" SLOT="0" @@ -21,7 +21,7 @@ src_prepare() { default # fix lib path for X11 and dont ignore LDFLAGS # respect CC and LD - eapply -p0 "${FILESDIR}"/$P-Makefile.patch + eapply -p0 "${FILESDIR}"/${P}-Makefile.patch eapply_user } diff --git a/sci-electronics/puff/puff-20181104.ebuild b/sci-electronics/puff/puff-20181104.ebuild index 80838dd3c7ef..3931f1297a2f 100644 --- a/sci-electronics/puff/puff-20181104.ebuild +++ b/sci-electronics/puff/puff-20181104.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="microwave CAD software" -HOMEPAGE="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/puff/" -SRC_URI="https://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}/${P}.tgz" +HOMEPAGE="https://www.pa3fwm.nl/software/puff/" +SRC_URI="https://www.pa3fwm.nl/software/${PN}/${P}.tgz" LICENSE="GPL-3" SLOT="0" @@ -22,7 +22,7 @@ src_prepare() { # fix lib path for X11 and dont ignore LDFLAGS # respect CC and LD # additional drop explicite format option for linker (bug #831569) - eapply -p0 "${FILESDIR}"/$P-Makefile.patch + eapply -p0 "${FILESDIR}"/${P}-Makefile.patch # add missing LDPATH for libX11.so sed -i -e "s:-lX11:-L/usr/$(get_libdir) -lX11:g" Makefile || die # drop no longer needed and now unsupported paramter '-T' (bug #8802225) diff --git a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild index 6d68a3f229f6..0b5446455b34 100644 --- a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild +++ b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -6,7 +6,7 @@ EAPI="8" inherit cmake xdg-utils if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" + EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git" inherit git-r3 else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild index 5def86e1cebb..f6e44dc48a2f 100644 --- a/sci-electronics/pulseview/pulseview-9999.ebuild +++ b/sci-electronics/pulseview/pulseview-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -6,7 +6,7 @@ EAPI="8" inherit cmake xdg-utils if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" + EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git" inherit git-r3 else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" diff --git a/sci-electronics/qelectrotech/metadata.xml b/sci-electronics/qelectrotech/metadata.xml index 610d2d8ea120..115e9d64a669 100644 --- a/sci-electronics/qelectrotech/metadata.xml +++ b/sci-electronics/qelectrotech/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild index 68f5ed0ee26b..9f04e6f2ee33 100644 --- a/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild +++ b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild @@ -1,4 +1,4 @@ -# Copyright 2001-2021 Gentoo Authors +# Copyright 2001-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else MY_P=qet-${PV/%0/.0} SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm64 ~x86" S="${WORKDIR}"/${MY_P} fi @@ -24,7 +24,7 @@ IUSE="doc" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND=" dev-db/sqlite:3 diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild index 17b3beea6240..ab1501d00974 100644 --- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild +++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2001-2021 Gentoo Authors +# Copyright 2001-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ IUSE="doc" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " RDEPEND=" dev-db/sqlite:3 diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild index 148370c0f790..9f8ce64111d0 100644 --- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild +++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -6,7 +6,7 @@ EAPI="8" inherit xdg-utils if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" + EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git" inherit git-r3 autotools else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild index 148370c0f790..9f8ce64111d0 100644 --- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild +++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -6,7 +6,7 @@ EAPI="8" inherit xdg-utils if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" + EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git" inherit git-r3 autotools else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" diff --git a/sci-electronics/spice/files/spice-3.5.5-arlocal.patch b/sci-electronics/spice/files/spice-3.5.5-arlocal.patch new file mode 100644 index 000000000000..575726fdb7b0 --- /dev/null +++ b/sci-electronics/spice/files/spice-3.5.5-arlocal.patch @@ -0,0 +1,11 @@ +--- spice3f5sfix/conf/deaults.orig 2023-07-23 16:26:09.073788130 +0300 ++++ spice3f5sfix/conf/defaults 2023-07-23 16:26:36.772571639 +0300 +@@ -173,7 +173,7 @@ + # spice3 source directory than in /tmp. Set to 'l' (lowercase 'L') + # to use the source directory, otherwise leave blank. + +-ARLOCAL = l ++ARLOCAL = + + # DEPEND_PROG is the command to generate dependencies from '.c' files + # (for "make depend"). Output should be of the form "x11.o: fte.h". diff --git a/sci-electronics/spice/spice-3.5.5-r3.ebuild b/sci-electronics/spice/spice-3.5.5-r4.ebuild index ed2fa12832f5..383863ebe1d0 100644 --- a/sci-electronics/spice/spice-3.5.5-r3.ebuild +++ b/sci-electronics/spice/spice-3.5.5-r4.ebuild @@ -1,29 +1,39 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit flag-o-matic toolchain-funcs MY_P="spice3f5sfix" DESCRIPTION="general-purpose circuit simulation program" -HOMEPAGE="http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/" -SRC_URI="http://www.ibiblio.org/pub/Linux/apps/circuits/${MY_P}.tar.gz" +HOMEPAGE="http://bwrcs.EECS.Berkeley.EDU/Classes/IcBook/SPICE/" +SRC_URI="https://www.ibiblio.org/pub/Linux/apps/circuits/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc ~x86" -RDEPEND="sys-libs/ncurses:0= +RDEPEND=" + sys-libs/ncurses:0= x11-libs/libXaw - >=app-misc/editor-wrapper-3" + >=app-misc/editor-wrapper-3 +" DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto - " +" -S=${WORKDIR}/${MY_P} +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-gcc-4.1.patch + # Bug https://bugs.gentoo.org/783192 + "${FILESDIR}"/${P}-arlocal.patch +) src_prepare() { # spice accepts -O1 at most @@ -32,25 +42,24 @@ src_prepare() { # Avoid re-creating WORKDIR due to stupid mtime touch .. - sed -i -e "s:termcap:ncurses:g" \ - -e "s:joe:/usr/libexec/editor:g" \ - -e "s:-O2 -s:${CFLAGS}:g" \ - -e "s:-lncurses -lm -s:-lncurses -lm ${LDFLAGS}:" \ - -e "s:SPICE_DIR)/lib:SPICE_DIR)/$(get_libdir)/spice:g" \ - -e "s:/usr/local/spice:/usr:g" \ - -e "s:/X11R6::" \ + sed -i -e "s/termcap/ncurses/g" \ + -e "s/joe/\/usr\/libexec\/editor/g" \ + -e "s/-O2 -s/${CFLAGS}/g" \ + -e "s/-lncurses -lm -s/-lncurses -lm ${LDFLAGS}/" \ + -e "s/SPICE_DIR)\/lib/SPICE_DIR)\/$(get_libdir)\/spice/g" \ + -e "s/\/usr\/local\/spice/\/usr/g" \ + -e "s/\/X11R6//" \ conf/linux || die - sed -i -e "s:head -1:head -n 1:" util/build || die - eapply "${FILESDIR}"/${P}-gcc-4.1.patch + sed -i -e "s/head -1/head -n 1/" util/build || die # fix possible buffer overflow (bug #339539) - sed -i -e "s:fgets(buf, BSIZE_SP:fgets(buf, sizeof(buf):g" \ + sed -i -e "s/fgets(buf, BSIZE_SP/fgets(buf, sizeof(buf)/g" \ src/lib/fte/misccoms.c || die # fix missing libtinfo if ncurses compiled with USE=tinfo (bug #605718) - sed -i -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" conf/linux || die + sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/g" conf/linux || die - eapply_user + default } src_compile() { @@ -64,9 +73,9 @@ src_install() { newbin obj/bin/help spice.help dosym spice3 /usr/bin/spice # install runtime stuff - rm -f lib/make* + rm lib/make* || die dodir /usr/$(get_libdir)/spice - cp -R lib/* "${D}"/usr/$(get_libdir)/spice/ || die "failed to copy libraries" + cp -R lib/* "${ED}"/usr/$(get_libdir)/spice/ || die "failed to copy libraries" # install docs doman man/man1/*.1 dodoc readme readme.Linux notes/spice2 diff --git a/sci-electronics/splat/files/splat-1.4.2-drop-register-keyword.patch b/sci-electronics/splat/files/splat-1.4.2-drop-register-keyword.patch new file mode 100644 index 000000000000..4445b06f2057 --- /dev/null +++ b/sci-electronics/splat/files/splat-1.4.2-drop-register-keyword.patch @@ -0,0 +1,22 @@ +Register keyword was deprecated in C++14 and removed in C++17 +Bug: https://bugs.gentoo.org/898168 +--- a/splat.cpp ++++ b/splat.cpp +@@ -567,7 +567,7 @@ double ElevationAngle(struct site source, struct site destination) + (downtilt), as referenced to a normal to the center of + the earth. */ + +- register double a, b, dx; ++ double a, b, dx; + + a=GetElevation(destination)+destination.alt+earthradius; + b=GetElevation(source)+source.alt+earthradius; +@@ -2727,7 +2727,7 @@ void PlotPath(struct site source, struct site destination, char mask_value) + + char block; + int x, y; +- register double cos_xmtr_angle, cos_test_angle, test_alt; ++ double cos_xmtr_angle, cos_test_angle, test_alt; + double distance, rx_alt, tx_alt; + + ReadPath(source,destination); diff --git a/sci-electronics/splat/splat-1.4.2-r1.ebuild b/sci-electronics/splat/splat-1.4.2-r1.ebuild new file mode 100644 index 000000000000..e8c4e8321e79 --- /dev/null +++ b/sci-electronics/splat/splat-1.4.2-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="RF Signal Propagation, Loss, And Terrain analysis tool" +HOMEPAGE="https://www.qsl.net/kd2bd/splat.html" +SRC_URI="https://www.qsl.net/kd2bd/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc hires l10n_es" + +DEPEND=" + app-arch/bzip2 + sys-libs/zlib +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.2-gcc43.patch + "${FILESDIR}"/${PN}-1.4.2-drop-register-keyword.patch +) + +src_configure() { + # fake resulting file from interactive configuration script + # using default resolution + cat <<- EOF > "${S}/splat.h" || die + /* Parameters for 3 arc-second standard resolution mode of operation */ + #define MAXPAGES 9 + #define HD_MODE 0 + EOF + if use hires; then + # fake resulting file from interactive configuration script + # using default resolution + cat <<- EOF > "${S}/hires.h" || die + /* Parameters for 3 arc-second hires resolution mode of operation */ + #define MAXPAGES 9 + #define HD_MODE 1 + EOF + fi +} + +src_compile() { + tc-export CC CXX + + cp {splat,rfsplat}.cpp || die + emake LDLIBS="-lm -lbz2" -E "rfsplat: itwom3.0.o" + if use hires; then + cp {hires,splat}.h || die + cp {splat,rfsplat-hd}.cpp || die + emake LDLIBS="-lm -lbz2" -E "rfsplat-hd: itwom3.0.o" + fi + + cd utils || die + + emake citydecoder usgs2sdf + emake LDLIBS=-lbz2 srtm2sdf + emake LDLIBS=-lm bearing +} + +src_install() { + local SPLAT_LANG="english" + use l10n_es && SPLAT_LANG="spanish" + # splat binary + dobin rfsplat + + use hires && dobin rfsplat-hd + + # utilities + dobin utils/{citydecoder,usgs2sdf,srtm2sdf,postdownload,bearing} + newman docs/${SPLAT_LANG}/man/splat.man rfsplat.1 + + dodoc CHANGES README utils/fips.txt + newdoc utils/README README.UTILS + + use doc && dodoc docs/${SPLAT_LANG}/{pdf/splat.pdf,postscript/splat.ps} + + #sample data + docinto sample_data + dodoc -r sample_data/. +} + +pkg_postinst() { + elog "The original SPLAT! command got renamed to 'rfsplat' to avoid" + elog "filename collision with app-portage/splat." + elog "" + elog "Be aware that it is still referenced as 'splat' in the documentation." +} diff --git a/sci-electronics/systemc/systemc-2.3.4-r1.ebuild b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild index 1b392e0ac3e4..ad0a4ea125bb 100644 --- a/sci-electronics/systemc/systemc-2.3.4-r1.ebuild +++ b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/accellera-official/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${PN}-${MY_PV}" fi diff --git a/sci-electronics/systemc/systemc-2.3.4-r2.ebuild b/sci-electronics/systemc/systemc-2.3.4-r2.ebuild index 9e61f04f5519..098270948b4f 100644 --- a/sci-electronics/systemc/systemc-2.3.4-r2.ebuild +++ b/sci-electronics/systemc/systemc-2.3.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/accellera-official/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${PN}-${MY_PV}" fi diff --git a/sci-electronics/vbs/Manifest b/sci-electronics/vbs/Manifest deleted file mode 100644 index 0ceb3941e1d8..000000000000 --- a/sci-electronics/vbs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vbs-1.4.0.tar.gz 275974 BLAKE2B a2a3b9654edefb52e22be166650b17959a72e2b1b6c1bb25708b52c33b3f33476f10b542b553959ae2310a7adcb328d5fa129ac34c6c6b6e62ca0a8880b3ff68 SHA512 78320f650d8f9f558143d0c13fd47697a738f540fa5f6e8718e6e9fdef67f794189b18c214be68d19a9a745527b57abb54e94fadfc8e83289a95e1ae48e41384 diff --git a/sci-electronics/vbs/files/vbs-1.4.0-const_cast.patch b/sci-electronics/vbs/files/vbs-1.4.0-const_cast.patch deleted file mode 100644 index 796aba52bb76..000000000000 --- a/sci-electronics/vbs/files/vbs-1.4.0-const_cast.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common/scp_tab.cc -+++ b/common/scp_tab.cc -@@ -148,7 +148,7 @@ - nm.replace(0,top.length()+1,""); - const char * n = nm.c_str(); - size_t full, sub,diff; -- char * last_dot = strrchr(n,'.'); -+ char * last_dot = const_cast<char*>(strrchr(n,'.')); - char * ret = 0; - if (last_dot != 0) - { diff --git a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch b/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch deleted file mode 100644 index b017e9e05dcf..000000000000 --- a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.1.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- a/common/bvector.h -+++ b/common/bvector.h -@@ -90,9 +90,9 @@ - size_type _size; // Size of this sub-bit vector. - - // Only bit_vector can create a sub_bit_vector object. -+ public: - sub_bit_vector(bit_vector &, const position_type, const position_type); - sub_bit_vector(const sub_bit_vector &); -- public: - sub_bit_vector &operator=(const sub_bit_vector &); - sub_bit_vector &operator=(const const_sub_bit_vector &); - sub_bit_vector &operator=(const bit_vector &); -@@ -116,8 +116,8 @@ - - // Only bit_vector can create a sub_bit_vector object. - const_sub_bit_vector(const bit_vector &, const position_type, const position_type); -- const_sub_bit_vector(const const_sub_bit_vector &); - public: -+ const_sub_bit_vector(const const_sub_bit_vector &); - size_type size() const - { return _size; } - ostream_type &info(ostream_type &) const; ---- a/common/logic.h -+++ b/common/logic.h -@@ -44,6 +44,10 @@ - { return (_state == HI) ? true : false; } - operator int() const - { return _state; } -+ -+ operator long int() const -+ { return _state; } -+ - operator char() const - { - switch (_state) ---- a/common/st_net.h -+++ b/common/st_net.h -@@ -133,4 +133,7 @@ - const st_net &_net; - }; - -+void entry_iovars(st_net::io_list &, st_net::arg_list &); -+void exit_iovars(st_net::io_list &, st_net::arg_list &); -+ - #endif // _ST_NET_H ---- a/expr/erdwr.cc -+++ b/expr/erdwr.cc -@@ -25,8 +25,9 @@ - expr_base * - read_expr::operator()() const - { -- VBSOBJ_EXPR_TYPE type; -- _in >> (int &) type; -+ int type_num = 0; -+ _in >> type_num; -+ VBSOBJ_EXPR_TYPE type = VBSOBJ_EXPR_TYPE(type_num); - long ln; - _in >> ln; - expr_base *expr = 0; ---- a/Makefile.in -+++ b/Makefile.in -@@ -329,13 +329,15 @@ - rm -f *.o - rm -f *.a - rm -f *.so -+ rm -f vbs - - clean-repo: - if test -d ptrepository; then rm -rf ptrepository; fi - rm -f *.rpo - - install: -- $(INSTALL) vbs $(bindir) -+ $(INSTALL) -d $(DESTDIR)$(bindir) -+ $(INSTALL) vbs $(DESTDIR)$(bindir) - - tarball: - @echo "===== Tar ball ======" ---- a/misc/mrdwr.cc -+++ b/misc/mrdwr.cc -@@ -21,8 +21,9 @@ - module * - read_module::operator()() const - { -- VBSOBJ_MISC_TYPE type; -- _in >> (int &) type; -+ int type_num = 0; -+ _in >> type_num; -+ VBSOBJ_MISC_TYPE type = VBSOBJ_MISC_TYPE(type_num); - if (type != VBSOBJ_MISC_MODULE) - { - vbs_err.set_data(vbs_error::SE_VBSOBJ, -1); -@@ -129,8 +130,9 @@ - port * - read_port::operator()() const - { -- VBSOBJ_MISC_TYPE type; -- _in >> (int &) type; -+ int type_num = 0; -+ _in >> type_num; -+ VBSOBJ_MISC_TYPE type = VBSOBJ_MISC_TYPE(type_num); - if (type != VBSOBJ_MISC_PORT) - { - vbs_err.set_data(vbs_error::SE_VBSOBJ, -1); diff --git a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.3.patch b/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.3.patch deleted file mode 100644 index 1bb55d824e7a..000000000000 --- a/sci-electronics/vbs/files/vbs-1.4.0-gcc-4.3.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/common/dumpstrm.cc -+++ b/common/dumpstrm.cc -@@ -13,6 +13,7 @@ - - #include <cstdio> // sprintf - #include <iostream> -+#include <cstdlib> - #include "dumpstrm.h" - - using std::cerr; ---- a/common/logic.h -+++ b/common/logic.h -@@ -18,6 +18,7 @@ - - #ifndef _LOGIC_H - #define _LOGIC_H -+#include <cstdlib> - - class logic - { ---- a/common/bvector.h -+++ b/common/bvector.h -@@ -30,6 +30,7 @@ - #include <string> - #include <utility> - #include <iostream> -+#include <cstring> - #include "common/logic.h" - - class bit_vector diff --git a/sci-electronics/vbs/metadata.xml b/sci-electronics/vbs/metadata.xml deleted file mode 100644 index 400878cd0df2..000000000000 --- a/sci-electronics/vbs/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-electronics@gentoo.org</email> - <name>Gentoo Electronics Project</name> - </maintainer> - <longdescription> - This program is a simple implementation of a Verilog simulator. VBS tries to - implement all of the Verilog behavioral constructs that are synthesizable, but - still allow complex test vectors for simulation. - </longdescription> -</pkgmetadata> diff --git a/sci-electronics/vbs/vbs-1.4.0.ebuild b/sci-electronics/vbs/vbs-1.4.0.ebuild deleted file mode 100644 index 4e58d702ffea..000000000000 --- a/sci-electronics/vbs/vbs-1.4.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="vbs - the Verilog Behavioral Simulator" -HOMEPAGE="http://www.geda.seul.org/tools/vbs/index.html" -SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND=" - sys-devel/flex - sys-devel/bison" -RDEPEND="" - -S="${WORKDIR}/${P}/src" -PATCHES=( - "${FILESDIR}"/${P}-gcc-4.1.patch - "${FILESDIR}"/${P}-gcc-4.3.patch - "${FILESDIR}"/${P}-const_cast.patch -) - -src_compile() { - emake -j1 vbs -} - -src_install() { - dobin vbs - cd .. || die - - einstalldocs - dodoc CHANGELOG* CONTRIBUTORS vbs.txt - - insinto /usr/share/${PF}/examples - doins -r EXAMPLES/. -} diff --git a/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild index 829abdbfcb48..31ddee59a282 100644 --- a/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild +++ b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,8 +13,7 @@ SRC_URI="https://github.com/jawatson/${PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz LICENSE="all-rights-reserved" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" +KEYWORDS="amd64 ~x86" RESTRICT="mirror bindist" diff --git a/sci-electronics/xcircuit/xcircuit-3.10.30-r1.ebuild b/sci-electronics/xcircuit/xcircuit-3.10.30-r2.ebuild index b4cf6a10fb70..5b7a88dac467 100644 --- a/sci-electronics/xcircuit/xcircuit-3.10.30-r1.ebuild +++ b/sci-electronics/xcircuit/xcircuit-3.10.30-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,14 +11,14 @@ HOMEPAGE="http://opencircuitdesign.com/xcircuit" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="tcl" DEPEND=" app-text/ghostscript-gpl:= media-libs/fontconfig:1.0= sys-libs/zlib:= - x11-libs/cairo + x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest index 4eaf602c3d4a..27940f492e67 100644 --- a/sci-electronics/xnec2c/Manifest +++ b/sci-electronics/xnec2c/Manifest @@ -1 +1,3 @@ DIST xnec2c-v4.4.12.tar.gz 1496988 BLAKE2B dbcea1e24382b9f2bb6e881007b44dcf99b9caa7f970ecbb1363e1a0e232d9d1bda6fe68f90622d81cdc69b3b9ff6019dd4b123d6a79f8c6bd088dbd804354b8 SHA512 0d1711260d7f69633d9e6bb559f3b56c2a25414f75ed913c643c0aaad5e4062834ce6c7c7816741f65436173b331e6f8f957c4a624a77214414865bac94ab7e8 +DIST xnec2c-v4.4.14.tar.gz 1509461 BLAKE2B 26aca7e4e328dff4e418d16499312bd3137fc9c46b382e928c1916fa111cfb7da2e891274ac414691b0e40520146a7c9da4781fa2864f1abcade247c2732fa89 SHA512 8fa407bf47a1cd600ddffb51b89b6f8ac869a6c8c5d8d1420a494d14c6d8c03e8a6ff845dcff3ac64aca0373d32980a0e1f4f615806df178cdef2eae2190212f +DIST xnec2c-v4.4.16.tar.gz 1509642 BLAKE2B d816ccbc8535b8a045f14cf6dd0e8b586a076fa2600fd3c0d71fd471efb6e63e739c20b3fa8427934e9e2cf71a9c12b701cbe44b5c4ffb96c78eeaa63fc5cbc5 SHA512 e7ccb0fe844c09ef36114835546f53ff92e053cf05fe64232efb3d7958b0860f86ef930296eb419dbe9b2ec2e9e0697de7e4fef3e2ec139566e585cf9b2cdba9 diff --git a/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild index 7f956b3139c9..cb4d85bd034f 100644 --- a/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild +++ b/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="doc examples" RDEPEND="dev-libs/glib:2 diff --git a/sci-electronics/xnec2c/xnec2c-4.4.14.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.14.ebuild new file mode 100644 index 000000000000..a968f495ffc9 --- /dev/null +++ b/sci-electronics/xnec2c/xnec2c-4.4.14.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg-utils + +MY_P=${PN}-v${PV} + +DESCRIPTION="A GTK+ graphical interactive version of nec2c" +HOMEPAGE="https://www.xnec2c.org" +SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples" + +RDEPEND="dev-libs/glib:2 + x11-libs/gtk+:3" +DEPEND="${RDEPEND} + sys-devel/gettext" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + eapply_user + # bug 896176 + sed -i -e "s/-D_FORTIFY_SOURCE=2//g" configure.ac || die + eautoreconf +} + +src_install() { + default + docompress -x /usr/share/man + + rm -R "${D}/usr/share/doc/${P}" || die + dodoc AUTHORS README.md doc/*.txt + use doc && dodoc -r doc/*.html doc/images + + if ! use examples ; then + rm -R "${D}/usr/share/${PN}/examples" || die + fi +} + +pkg_postinst() { + xdg_mimeinfo_database_update + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_mimeinfo_database_update + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/sci-electronics/xnec2c/xnec2c-4.4.16.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.16.ebuild new file mode 100644 index 000000000000..e612d0a3dadf --- /dev/null +++ b/sci-electronics/xnec2c/xnec2c-4.4.16.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg-utils + +MY_P=${PN}-v${PV} + +DESCRIPTION="A GTK+ graphical interactive version of nec2c" +HOMEPAGE="https://www.xnec2c.org" +SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz" + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc examples" + +RDEPEND="dev-libs/glib:2 + x11-libs/gtk+:3" +DEPEND="${RDEPEND} + sys-devel/gettext" + +src_prepare() { + eapply_user + # bug 896176 + sed -i -e "s/-D_FORTIFY_SOURCE=2//g" configure.ac || die + eautoreconf +} + +src_install() { + default + docompress -x /usr/share/man + + rm -R "${D}/usr/share/doc/${P}" || die + dodoc AUTHORS README.md doc/*.txt + use doc && dodoc -r doc/*.html doc/images + + if ! use examples ; then + rm -R "${D}/usr/share/${PN}/examples" || die + fi +} + +pkg_postinst() { + xdg_mimeinfo_database_update + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_mimeinfo_database_update + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/sci-electronics/xnecview/Manifest b/sci-electronics/xnecview/Manifest new file mode 100644 index 000000000000..8a9aa6cdf579 --- /dev/null +++ b/sci-electronics/xnecview/Manifest @@ -0,0 +1 @@ +DIST xnecview-1.37.tgz 79005 BLAKE2B 505ba69b7ba77355f789b36af3e1df3719eb0a9179541d83a26285a0e5c84fc7b9b156bf4d586bfa28af0074819e397bf7441e39a819972c701e6487787c07d3 SHA512 6fc4beec1b9502d6084d4e412b8bb89d1deeaab5bfa6c0341cba1a899fb9a59eb1e7f9dfc61a97f2853ecff57c241dc9af993b176410799a07f113e3a60f75d7 diff --git a/sci-electronics/xnecview/files/xnecview-tc-variables.patch b/sci-electronics/xnecview/files/xnecview-tc-variables.patch new file mode 100644 index 000000000000..cd8a5c7d04dd --- /dev/null +++ b/sci-electronics/xnecview/files/xnecview-tc-variables.patch @@ -0,0 +1,29 @@ +diff -Naur xnecview-1.37.org/Makefile xnecview-1.37/Makefile +--- xnecview-1.37.org/Makefile 2006-03-27 22:38:37.000000000 +0200 ++++ xnecview-1.37/Makefile 2022-09-01 19:00:31.929015747 +0200 +@@ -3,11 +3,12 @@ + + + +-CC = gcc +-CFLAGS = -O2 -g -Wall `pkg-config gtk+-2.0 --cflags` ++CC ?= gcc ++CFLAGS ?= -O2 -g -Wall ++CFLAGS += `$(PKG_CONFIG) gtk+-2.0 --cflags` + +-LD = $(CC) +-LDFLAGS = `pkg-config gtk+-2.0 --libs` -lm ++LD ?= $(CC) ++LDFLAGS += `$(PKG_CONFIG) gtk+-2.0 --libs` -lm + + ifeq ($(PNG),yes) + CFLAGS += -DHAVE_LIBPNG +@@ -20,7 +21,7 @@ + all: xnecview + + xnecview: $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o xnecview ++ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o xnecview + + xnecview.tgz: $(SRCS) + tar czvf xnecview.tgz COPYING README HISTORY Imakefile Imakefile_nopng Makefile $(SRCS) xnecview.h config.h xnecview.1x xnecview.man diff --git a/sci-electronics/xnecview/metadata.xml b/sci-electronics/xnecview/metadata.xml new file mode 100644 index 000000000000..2f6ad5330dc3 --- /dev/null +++ b/sci-electronics/xnecview/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> + Xnecview is a program for visualizing the input and output files of the + NEC antenna simulation software. It runs on Linux/Unix systems with the + X window system. + </longdescription> +</pkgmetadata> diff --git a/sci-electronics/xnecview/xnecview-1.37.ebuild b/sci-electronics/xnecview/xnecview-1.37.ebuild new file mode 100644 index 000000000000..23ffa4d06bc9 --- /dev/null +++ b/sci-electronics/xnecview/xnecview-1.37.ebuild @@ -0,0 +1,37 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A program for visualizing NEC2 input and output data" +HOMEPAGE="https://www.pa3fwm.nl/software/xnecview/" +SRC_URI="https://www.pa3fwm.nl/software/xnecview/xnecview-${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND=" + >=media-libs/libpng-1.6 + x11-libs/gtk+:2 +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-tc-variables.patch" +) + +src_compile() { + tc-export CC LD PKG_CONFIG + emake +} + +src_install() { + dobin xnecview + doman xnecview.1x + dodoc README + dodoc HISTORY +} diff --git a/sci-electronics/xoscope/xoscope-2.3.ebuild b/sci-electronics/xoscope/xoscope-2.3.ebuild index f2b41d1c55c3..091317b23add 100644 --- a/sci-electronics/xoscope/xoscope-2.3.ebuild +++ b/sci-electronics/xoscope/xoscope-2.3.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools linux-info +inherit autotools flag-o-matic linux-info DESCRIPTION="Soundcard Oscilloscope for X" HOMEPAGE="http://xoscope.sourceforge.net" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" RDEPEND=" dev-libs/glib:2 @@ -32,3 +32,12 @@ src_prepare() { default eautoreconf } + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/878065 + # https://sourceforge.net/p/xoscope/bugs/23/ + filter-lto + + default +} |