diff options
Diffstat (limited to 'sci-electronics')
80 files changed, 533 insertions, 1493 deletions
diff --git a/sci-electronics/drahnr-oregano/Manifest b/sci-electronics/drahnr-oregano/Manifest deleted file mode 100644 index 155b49806c7a..000000000000 --- a/sci-electronics/drahnr-oregano/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST drahnr-oregano-0.84.40.tar.gz 1879082 BLAKE2B 8b8e0ffc6af0205018bb1a415f1f0e067d30f8c86681f145b8000a71d414c540c32cfb99af48b9e7c4a1b1e71cebbe76b22c05ccd511797ba7db2efdc8de2079 SHA512 f4e38ccf09f148cbe609ccfebe3d3476e6b385f4d002cb951ed0d488d84f65557c0fcac986c6e7657684a07d7f7dac4dda663278ed85363de0dcf48f8d02f73e diff --git a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild deleted file mode 100644 index 494f5778347b..000000000000 --- a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='threads(+)' - -inherit python-any-r1 waf-utils xdg - -DESCRIPTION="Application for the schematic capturing and simulation of electrical circuits" -HOMEPAGE="https://github.com/drahnr/oregano" -SRC_URI="https://github.com/drahnr/oregano/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -S="${WORKDIR}/oregano-${PV}" - -DEPEND=" - dev-libs/glib:2 - dev-libs/libxml2:2 - x11-libs/goocanvas:2.0 - x11-libs/gtk+:3 - x11-libs/gtksourceview:3.0" - -BDEPEND="${PYTHON_DEPS} - dev-util/glib-utils - virtual/pkgconfig" - -RDEPEND="${DEPEND} - || ( - gnome-base/dconf - gnome-base/gconf - ) - sci-electronics/electronics-menu" - -src_configure() { - waf-utils_src_configure -} - -src_install() { - waf-utils_src_install --no-xdg --no-install-gschema - docompress -x /usr/share/doc/${PF}/{dev-docs,sequence} - dodoc -r docs/{dev-docs,sequence,user-docs} - insinto /usr/share/glib-2.0/schemas - doins data/settings/io.ahoi.oregano.gschema.xml -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Note: You'll need to emerge your prefered simulation backend" - elog "such as sci-electronics/ngspice (preferred) or sci-electronics/gnucap" - elog "for simulation to work." - elog "As an alternative generate a netlist and use sci-electronics/spice" - elog "from the command line for simulation." -} diff --git a/sci-electronics/drahnr-oregano/metadata.xml b/sci-electronics/drahnr-oregano/metadata.xml deleted file mode 100644 index c3c62f45ee23..000000000000 --- a/sci-electronics/drahnr-oregano/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - Oregano is an application for schematic capture and simulation of electrical - circuits. The actual simulation is performed by Berkeley Spice, or GNUcap or - the new generation ngspice. - It's alive fork of oregano - </longdescription> - <upstream> - <remote-id type="github">drahnr/oregano</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-electronics/electric/Manifest b/sci-electronics/electric/Manifest index 7d4c2cc73e25..843f33a477e1 100644 --- a/sci-electronics/electric/Manifest +++ b/sci-electronics/electric/Manifest @@ -1 +1,2 @@ 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.07.ebuild b/sci-electronics/electric/electric-9.07.ebuild new file mode 100644 index 000000000000..39e2f2779ff5 --- /dev/null +++ b/sci-electronics/electric/electric-9.07.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=virtual/jre-1.6 + sci-electronics/electronics-menu" +BDEPEND="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/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 51f9bccaff8e..b778335ec365 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,3 +1 @@ -DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2 -DIST gazebo-11.11.0.tar.bz2 56505651 BLAKE2B c3f63a1ee128fd86be914ba9ad7567d0adf337d82772184bbc362373083ad2b79f1172998182a70faf4127fe6f5996d6946e79927c40a384ac5e0eef3b7799c9 SHA512 f9062a54ee4e252219a246124ad0a22570e12f34f7bced8910a14b96541b16337efbba0f824b0ba70adf91d41acfc407eb0cdb19bbd7272151ef9723acc48882 DIST gazebo-11.12.0.tar.bz2 56542859 BLAKE2B f2da8371fa4655cc831401fcf6ceec8c82d507a93515762c078ac20a78cb4b739c9f373ef53bebc71b5d7e1c1cf4b98928b3e855fca6943a09da554ee19df1cb SHA512 8f60d432ab07084951bbe31c632f04f2fa11500441fb81fe27078a5cb5b67ba681889e1079844d44a5a30df562797d51683fd674942db9fd8c4d853e3e2c5d3e diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch deleted file mode 100644 index 7b7c8d7270fd..000000000000 --- a/sci-electronics/gazebo/files/ffmpeg4.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc -+++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc -@@ -224,7 +224,10 @@ bool VideoEncoder::Start(const std::stri - - // The remainder of this function handles FFMPEG initialization of a video - // stream -- const AVOutputFormat *outputFormat = nullptr; -+#if LIBAVFORMAT_VERSION_MAJOR >= 59 -+ const -+#endif -+ AVOutputFormat *outputFormat = nullptr; - - // This 'if' and 'free' are just for safety. We chech the value of formatCtx - // below. diff --git a/sci-electronics/gazebo/files/ffmpeg5.patch b/sci-electronics/gazebo/files/ffmpeg5.patch deleted file mode 100644 index e55bab3c311f..000000000000 --- a/sci-electronics/gazebo/files/ffmpeg5.patch +++ /dev/null @@ -1,137 +0,0 @@ -Index: gazebo-11.10.1/gazebo/common/AudioDecoder.cc -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.cc -+++ gazebo-11.10.1/gazebo/common/AudioDecoder.cc -@@ -113,8 +113,13 @@ bool AudioDecoder::Decode(uint8_t **_out - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- bytesDecoded = avcodec_decode_audio4(this->codecCtx, decodedFrame, -- &gotFrame, &packet1); -+ bytesDecoded = avcodec_send_packet(this->codecCtx, &packet1); -+ if (bytesDecoded >= 0 || bytesDecoded == AVERROR_EOF) { -+ bytesDecoded = avcodec_receive_frame(this->codecCtx, decodedFrame); -+ gotFrame = bytesDecoded >= 0; -+ if (bytesDecoded == AVERROR(EAGAIN) || bytesDecoded == AVERROR_EOF) bytesDecoded = 0; -+ } -+ - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -@@ -214,7 +219,7 @@ bool AudioDecoder::SetFile(const std::st - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) -+ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -@@ -238,7 +243,9 @@ bool AudioDecoder::SetFile(const std::st - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- this->codecCtx = this->formatCtx->streams[audioStream]->codec; -+ this->codecCtx = avcodec_alloc_context3(nullptr); -+ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[audioStream]->codecpar); -+ - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -Index: gazebo-11.10.1/gazebo/common/AudioDecoder.hh -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.hh -+++ gazebo-11.10.1/gazebo/common/AudioDecoder.hh -@@ -75,7 +75,7 @@ namespace gazebo - private: AVCodecContext *codecCtx; - - /// \brief libavcodec audio codec. -- private: AVCodec *codec; -+ private: const AVCodec *codec; - - /// \brief Index of the audio stream. - private: int audioStream; -Index: gazebo-11.10.1/gazebo/common/Video.cc -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/Video.cc -+++ gazebo-11.10.1/gazebo/common/Video.cc -@@ -77,7 +77,7 @@ void Video::Cleanup() - #ifdef HAVE_FFMPEG - bool Video::Load(const std::string &_filename) - { -- AVCodec *codec = nullptr; -+ const AVCodec *codec = nullptr; - this->videoStream = -1; - - if (this->formatCtx || this->avFrame || this->codecCtx) -@@ -107,7 +107,7 @@ bool Video::Load(const std::string &_fil - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) -+ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -@@ -128,13 +128,14 @@ bool Video::Load(const std::string &_fil - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- this->codecCtx = this->formatCtx->streams[this->videoStream]->codec; -+ this->codecCtx = avcodec_alloc_context3(nullptr); -+ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[this->videoStream]->codecpar); - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif - - // Find the decoder for the video stream -- codec = avcodec_find_decoder(this->codecCtx->codec_id); -+ codec = avcodec_find_decoder(this->formatCtx->streams[this->videoStream]->codecpar->codec_id); - if (codec == nullptr) - { - gzerr << "Codec not found\n"; -@@ -231,15 +232,19 @@ bool Video::GetNextFrame(unsigned char * - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -- int processedLength = avcodec_decode_video2(this->codecCtx, this->avFrame, -- &frameAvailable, &tmpPacket); -+ int processedLength = avcodec_send_packet(this->codecCtx, !tmpPacket.data && !tmpPacket.size ? nullptr : &tmpPacket); - #ifndef _WIN32 - # pragma GCC diagnostic pop - #endif -+ if (processedLength >= 0 || processedLength == AVERROR_EOF) { -+ processedLength = avcodec_receive_frame(this->codecCtx, this->avFrame); -+ frameAvailable = processedLength >= 0; -+ if (processedLength == AVERROR(EAGAIN) || processedLength == AVERROR_EOF) processedLength = 0; -+ } - if (processedLength < 0) - { - gzerr << "Error while processing the data\n"; -- break; -+ break; - } - - tmpPacket.data = tmpPacket.data + processedLength; -Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc -=================================================================== ---- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc -+++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc -@@ -224,7 +224,7 @@ bool VideoEncoder::Start(const std::stri - - // The remainder of this function handles FFMPEG initialization of a video - // stream -- AVOutputFormat *outputFormat = nullptr; -+ const AVOutputFormat *outputFormat = nullptr; - - // This 'if' and 'free' are just for safety. We chech the value of formatCtx - // below. -@@ -294,7 +294,7 @@ bool VideoEncoder::Start(const std::stri - } - - // find the video encoder -- AVCodec *encoder = avcodec_find_encoder( -+ const AVCodec *encoder = avcodec_find_encoder( - this->dataPtr->formatCtx->oformat->video_codec); - if (!encoder) - { diff --git a/sci-electronics/gazebo/gazebo-11.10.2.ebuild b/sci-electronics/gazebo/gazebo-11.10.2.ebuild deleted file mode 100644 index d813f60aea22..000000000000 --- a/sci-electronics/gazebo/gazebo-11.10.2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/" -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.1:= - 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 - 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-text/ronn ) - app-arch/gzip - virtual/pkgconfig -" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/qwt2.patch" - "${FILESDIR}/cmake.patch" - "${FILESDIR}/ffmpeg5.patch" - "${FILESDIR}/ffmpeg4.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/gazebo/gazebo-11.11.0.ebuild b/sci-electronics/gazebo/gazebo-11.11.0.ebuild deleted file mode 100644 index 4eac05330fc9..000000000000 --- a/sci-electronics/gazebo/gazebo-11.11.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/" -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-text/ronn ) - app-arch/gzip - virtual/pkgconfig -" -CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}/qwt2.patch" - "${FILESDIR}/cmake.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/gazebo/gazebo-11.12.0.ebuild b/sci-electronics/gazebo/gazebo-11.12.0.ebuild index 4eac05330fc9..79c54a12daca 100644 --- a/sci-electronics/gazebo/gazebo-11.12.0.ebuild +++ b/sci-electronics/gazebo/gazebo-11.12.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="A 3D multiple robot simulator with dynamics" -HOMEPAGE="http://gazebosim.org/" +HOMEPAGE="https://gazebosim.org/home" SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" LICENSE="Apache-2.0" diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest index 0f8320821363..d958a168c245 100644 --- a/sci-electronics/gnucap/Manifest +++ b/sci-electronics/gnucap/Manifest @@ -1,6 +1 @@ -DIST gnucap-2009-12-07-models-bsim.tar.gz 4074699 BLAKE2B e8d48be7eb22bfe360a4cd80e3605b292be7839100e1ebd40a718bc23c5f9d2330fb3a58c9c18bebaf8b87a6fad3002f5596a4f83e41eefa0eab8f4ed5d9b18e SHA512 4f7caaeab0268df113da726f4fbd5a0f3eff63c325a7c08f0cd10ec727318aff6a51ce81619f0f3e31b87f89a51643cd608cb14ba09a70fb7294df9748ed1db4 -DIST gnucap-2009-12-07-models-jspice3-2.5.tar.gz 502564 BLAKE2B a0c60671cb338035035a50cdc6f2d7e9df9aaf7f2ee3c0bd600ec4d0a8aafd2628c6acf37c89f9f7c7ec3879220dc81ceec191ad9cc0a31def76d6df5bba1606 SHA512 90d93912d5d000218f43e7b63efcd43473467d7d51c1cee160f3fbe53b0bafd5bdeaf5680e2ca67d3176063ba026352248412d1e266d3f6ed93e731e476d61fe -DIST gnucap-2009-12-07-models-ngspice17.tar.gz 4418060 BLAKE2B b7d300cc93b870b13eab25d4b0303af647303551f2777e61cc38d18d770e9b446b9a1e4f8fd94b81c11f96eb1c6bac4ef113f69806a979ac3fe69903e0855d91 SHA512 0f26b4491531d41f18d35b8cde339e99b593794495346186dac74f72bd3632dfe4690ede50a972c47ae41b2229a62d708ecd28bb8fc04b5b7347a481bca709d5 -DIST gnucap-2009-12-07-models-spice3f5.tar.gz 629424 BLAKE2B 3369374942a0b0b14dc484a6d49b9650d461112f15623f43b1140a4bddd4d23a6035c4c31294f1003828b93bc21b1c1c059acf61c2db85c9578bb8162e247234 SHA512 4c16e4bcdd3b4092bd6c89c56421ef9ca85b6aba90d9e244fee03278916c6b5ac1c56ecba62d4a5561ff3d93abc61492c0116ccc350c483128ca792b52fa7155 -DIST gnucap-2009-12-07.tar.gz 545578 BLAKE2B a1ff8ed82a8ab57c455fdb96c399a5e480b1eb898d439e39380c4287d65538e9c0e1f61aef08c616aff34390a507243edc1fbb2f55b2bfc6d383264e2281e1c9 SHA512 c0e8a4f6b66eeff2cf95e9cf2050a25aa08f660de1e4b3e78011998deb93cd4e5b562cdcf5f3beb72e04cb3c7650cde6ae8c81602ffc31f5e333d84e7e3867a9 DIST gnucap-20210107.tar.gz 801944 BLAKE2B fcef1e234710575285446c63cae85e2ef7e82e74ab65627614b8cc2bd0511427b63aa352a335c2b56c159b9129ce4cac998b86ddd29c19f9c57a63cfc2354676 SHA512 7f85a69f73808091b0826bb671174ad2515771c36e624031fb2fe79671366c57cd20ce9c973359869146a90fc568bc0ae1c354655e9d5cd75507b069f45cbfb7 diff --git a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild b/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild deleted file mode 100644 index 6503c350f6fd..000000000000 --- a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs flag-o-matic - -SNAPSHOTDATE="${P##*.}" -MY_PV="${PN}-${SNAPSHOTDATE:0:4}-${SNAPSHOTDATE:4:2}-${SNAPSHOTDATE:6:2}" - -DESCRIPTION="GNUCap is the GNU Circuit Analysis Package" -SRC_URI="http://www.gnucap.org/devel/${MY_PV}.tar.gz - http://www.gnucap.org/devel/${MY_PV}-models-bsim.tar.gz - http://www.gnucap.org/devel/${MY_PV}-models-jspice3-2.5.tar.gz - http://www.gnucap.org/devel/${MY_PV}-models-ngspice17.tar.gz - http://www.gnucap.org/devel/${MY_PV}-models-spice3f5.tar.gz" -HOMEPAGE="http://www.gnucap.org/" - -IUSE="examples" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc x86" - -# NOTE: readline could be made optional, but I don't see a point for now. -RDEPEND="sys-libs/readline:=" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PV}" - -src_prepare() { - # No need to install COPYING and INSTALL - sed -i \ - -e 's: COPYING INSTALL::' \ - -e 's:COPYING history INSTALL:history:' \ - doc/Makefile.in || die - - if ! use examples ; then - sed -i \ - -e 's:examples modelgen:modelgen:' \ - Makefile.in || die - fi - - sed -i -e 's:CFLAGS = -O2 -g:CPPFLAGS +=:' \ - -e '/CCFLAGS =/i\CFLAGS += $(CPPFLAGS)' \ - -e 's:CCFLAGS = $(CFLAGS):CXXFLAGS += $(CPPFLAGS):' \ - -e 's:LDFLAGS = :LDFLAGS += :' \ - -e 's:CCFLAGS:CXXFLAGS:' \ - -e "s:../Gnucap:${S}/src:" \ - models-*/Make2 || die - - sed -i -e "s:strchr(str2, '|'):const_cast<char*>(strchr(str2, '|')):" \ - {src,modelgen}/ap_match.cc || die - - tc-export CC CXX - append-cxxflags -std=gnu++98 - - default -} - -src_compile() { - emake - for PLUGIN_DIR in models-* ; do - cd "${S}/${PLUGIN_DIR}" - emake CC="$(tc-getCC)" CCC="$(tc-getCXX)" - done -} - -src_install() { - emake DESTDIR="${D}" install - insopts -m0755 - for PLUGIN_DIR in models-* ; do - insinto /usr/$(get_libdir)/gnucap/${PLUGIN_DIR} - cd "${S}/${PLUGIN_DIR}" - for PLUGIN in */*.so ; do - newins ${PLUGIN} ${PLUGIN##*/} - done - done -} - -pkg_postinst() { - elog "Documentation for development releases is now available at :" - elog " http://wiki.gnucap.org/dokuwiki/doku.php?id=gnucap:manual" -} diff --git a/sci-electronics/gnucap/gnucap-20210107.ebuild b/sci-electronics/gnucap/gnucap-20210107.ebuild index f898c65a2a47..f29ea8e434d1 100644 --- a/sci-electronics/gnucap/gnucap-20210107.ebuild +++ b/sci-electronics/gnucap/gnucap-20210107.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 @@ -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/gtkwave/gtkwave-3.3.106.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild index 0b3043548834..62fd0865a965 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-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.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 fatlines judy lzma packed tcl" RDEPEND=" diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest index 6fcf9b0ad44b..93fe6567d4d1 100644 --- a/sci-electronics/kicad-footprints/Manifest +++ b/sci-electronics/kicad-footprints/Manifest @@ -1,4 +1,2 @@ -DIST kicad-footprints-5.1.12.tar.bz2 3382783 BLAKE2B 6f7725bebd6099d86780ed2582aacfb3abff4db6065a6a17fcd7631782a0c2e1e8a23064f80cd95c79bbaca8da52003f01fce7e398e95596e45f15b144eeef7f SHA512 e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9 -DIST kicad-footprints-6.0.6.tar.gz 31647789 BLAKE2B 3af7027987b25c4a3ee19925acaa539cea643656e1662f0b80ec76c807aca9ef7433228fc88cdd0c34b80e7bbb886abd5c11765983e9adc5b347ce01bd4b51c4 SHA512 6d93a90bfc0b246c70b336aa9265a051a33d8b490a81271fb85ab73cd19184a031f3429ce8ae9e1650ece475a30f0f283c43c5bb2d1f427b4129d4ed61480ac0 -DIST kicad-footprints-6.0.7.tar.gz 31657956 BLAKE2B 127ac81c83841919903b300af89c2126e1f53ff1c03d6dcd2466eac8d4733da4f923831e24aa43fca2b5c6d9ee4389bd67f0bd2b4d300adb5356e261b14e897e SHA512 e0959846e057df46e38385d1fe71895930435fc51ad03bbc893481264d969d9739967b069855b59341388fec5458a4f2c71c527b7af7357437c5606c91f5436d 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 diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild deleted file mode 100644 index 919b81b50669..000000000000 --- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 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://kicad.github.io/footprints/" -SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="CC-BY-SA-4.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=">=sci-electronics/kicad-5.1.0" diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.7.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.7.ebuild deleted file mode 100644 index e1268b9afd0d..000000000000 --- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.7.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 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 - 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" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - fi - - S="${WORKDIR}/${PN}-${MY_PV}" -fi - -LICENSE="CC-BY-SA-4.0" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND=">=sci-electronics/kicad-6.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-6.0.9.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.9.ebuild index e1268b9afd0d..8a46cc5de857 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.9.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.9.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 @@ -17,7 +17,7 @@ else SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.6.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-7.0.0.ebuild index 2417f3ce4b79..ba02cb94ca78 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.6.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-7.0.0.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 @@ -12,15 +12,9 @@ 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" @@ -28,7 +22,7 @@ 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-9999.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild index 995b74bb1881..c1edf53f4705 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,15 +12,9 @@ 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 ~x86" - fi - - S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi LICENSE="CC-BY-SA-4.0" diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest deleted file mode 100644 index 5619127f9c88..000000000000 --- a/sci-electronics/kicad-i18n/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kicad-i18n-5.1.12.tar.bz2 2934525 BLAKE2B 7aef8a0e5213be38e5517a539469cba41d67dc2495539c7f5722f6cf7e3a86b8eaefa341d18a621b36c100ddd89466fbf5ac9d8071e5f78587161a8c0bb430d1 SHA512 178a17919e762f284aaf1fab75d527085a2bcec8dc6e236a552c6c471aab5ca4f747d297d8f148dbe9cc80a0c4994b712b54da077029ff484006b6c42dc22916 diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild deleted file mode 100644 index ec60fdc59456..000000000000 --- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Electronic Schematic and PCB design tools GUI translations" -HOMEPAGE="https://gitlab.com/kicad/code/kicad-i18n" -SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="CC-BY-SA-4.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -BDEPEND="sys-devel/gettext" -RDEPEND=">=sci-electronics/kicad-5.1.6" diff --git a/sci-electronics/kicad-i18n/metadata.xml b/sci-electronics/kicad-i18n/metadata.xml deleted file mode 100644 index 8cbb9ea9aa19..000000000000 --- a/sci-electronics/kicad-i18n/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>zoltan@sinustrom.info</email> - <name>Zoltan Puskas</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">kicad/kicad-i18n</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild deleted file mode 100644 index 03f88d62d7d9..000000000000 --- a/sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 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" -KEYWORDS="~amd64 ~arm64" -IUSE="doc minimal nls" - -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} - ) - nls? ( - >=sci-electronics/kicad-i18n-${PV} - ) -" diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.7.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.7.ebuild deleted file mode 100644 index 9b332cea06f2..000000000000 --- a/sci-electronics/kicad-meta/kicad-meta-6.0.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2022 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 - -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-6.0.9.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.9.ebuild index 9b332cea06f2..a9b6381bc4ae 100644 --- a/sci-electronics/kicad-meta/kicad-meta-6.0.9.ebuild +++ b/sci-electronics/kicad-meta/kicad-meta-6.0.9.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 @@ LICENSE="metapackage" SLOT="0" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi IUSE="doc minimal" diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.6.ebuild b/sci-electronics/kicad-meta/kicad-meta-7.0.0.ebuild index f61d28129315..9fa1015e5396 100644 --- a/sci-electronics/kicad-meta/kicad-meta-6.0.6.ebuild +++ b/sci-electronics/kicad-meta/kicad-meta-7.0.0.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 @@ -10,9 +10,7 @@ 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-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest index 3e37757bcfbe..f576a4d1385b 100644 --- a/sci-electronics/kicad-packages3d/Manifest +++ b/sci-electronics/kicad-packages3d/Manifest @@ -1,4 +1,2 @@ -DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2 -DIST kicad-packages3d-6.0.6.tar.gz 951710688 BLAKE2B 16176514519897167807b9c2d6659b16d38574484bc09fd871c97ea943531f8726a8173b5a3d143818397eb1086db0d6bda43add357c95e92bffac05560ec9f2 SHA512 f8231c4ce508eb379ceb397cf6e9f963411a0a5cee5d1fa9a9e929c964662d391ab12555c4d3e8bca1b9507338571f3036af7f24e6a4d093f8f2aa3ba93e9345 -DIST kicad-packages3d-6.0.7.tar.gz 952830693 BLAKE2B 0eec72303c3146f3b11092a2e7129e53b68fefa4a869e9e87302aa04e092d96514f12a2344b8964a13701a1d7198ad39848b5496c81ae0090ce41670b4a7618f SHA512 cbbeaa85df3e2b9a8c8616994607ff446b8d97dc039562b9c3823ad8cf2efabc02eb49f1a34b6ac3545db21dfbb264d79d05f2edeb2c79a13fd1093999f331f9 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 diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild deleted file mode 100644 index d37150d3243e..000000000000 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2022 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://kicad.github.io/packages3d/" -SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="CC-BY-SA-4.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="+occ" - -RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]" - -CHECKREQS_DISK_BUILD="11G" -S="${WORKDIR}/${P/3d/3D}" diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.6.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.6.ebuild deleted file mode 100644 index ec626e8dff33..000000000000 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.6.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 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 - MY_PV="${PV/_rc/-rc}" - MY_P="${PN}-${MY_PV}" - # Source directory for this package always has the repository hash in the directory name - MY_HASH="6bfd8dfa3adc6ac316b9857977c87f22282c6e24" - SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~arm64 ~riscv ~x86" - fi - - S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-${MY_HASH}" -fi - -IUSE="+occ" -LICENSE="CC-BY-SA-4.0" -SLOT="0" - -RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]" - -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-6.0.9.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.9.ebuild index 5646b83a340a..344b60c32007 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.9.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.9.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 @@ else S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi fi diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.7.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.0.ebuild index 5646b83a340a..0814793b5346 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.7.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.0.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 @@ -12,21 +12,17 @@ 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" +IUSE="" 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-9999.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild index 73ab0306ec3d..c5aa25338d99 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-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,21 +12,17 @@ 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 ~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" +IUSE="" LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]" +RDEPEND=">=sci-electronics/kicad-6.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest index 406285e31106..e63451e036a0 100644 --- a/sci-electronics/kicad-symbols/Manifest +++ b/sci-electronics/kicad-symbols/Manifest @@ -1,4 +1,2 @@ -DIST kicad-symbols-5.1.12.tar.bz2 1815145 BLAKE2B e3a74c0e2cb24f4286cdd7fa63b62c72c39575475305680ba8e19d5b3acb5c6cbff1e17d37d169043949ad89ffb9b94f0341e1faf7d063c1cf9872d31b863e21 SHA512 32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6 -DIST kicad-symbols-6.0.6.tar.gz 4845755 BLAKE2B 32bf6a03f5f06be09b571e0d5470059bc799d662aefd40554e6d9603f29862af3d75f600218f715026349216bbc1a6ea3000eff5a3a5ef8c66a8643f83872090 SHA512 edd8f2d2d34c0431bd23a8ae0433f2ce311aebecef4672ddf7b5d1bfaf71bf4cd8f98f3dcaa9e1662f5a928e204aff834b5e19cea77a31d2e3a23373f760406c -DIST kicad-symbols-6.0.7.tar.gz 4846798 BLAKE2B 1691027e1bb9e93ee4e390590e748ff0dc0994d740f999a1220c9897c44deb71b62de2df4a1cb8817cca828317b3d7ac7a678bcff1a9570abedf3b9cce518541 SHA512 27b05f46b48de338266a713da92cf96af59918fbc4850de05bce5ddf5ed9b2d7e949cbbf8c23b22663c2388824f8de464bafe1df31e829620c0ff19f4e7f7be2 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 diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild deleted file mode 100644 index 0af175056d99..000000000000 --- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 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://kicad.github.io/symbols/" -SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="CC-BY-SA-4.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=">=sci-electronics/kicad-5.1.0" diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.7.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.7.ebuild deleted file mode 100644 index 02943f2ff696..000000000000 --- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 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.gz" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - fi -fi - -LICENSE="CC-BY-SA-4.0" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND=">=sci-electronics/kicad-6.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-6.0.9.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.9.ebuild index 02943f2ff696..34f69ac0a947 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.9.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.9.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 @@ -15,7 +15,7 @@ else SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.gz" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi fi diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.6.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-7.0.0.ebuild index ae646b3be799..26631a5e5f9f 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.6.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-7.0.0.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 @@ -12,11 +12,9 @@ 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" @@ -24,7 +22,7 @@ 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-9999.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild index 2fcbfb8a9bca..52266ac8a79e 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-2022 Gentoo Authors +# Copyright 1999-2023 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-symbols.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 ~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" if [[ ${PV} == 9999 ]] ; then diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest index 284c673e81cc..d450d416a649 100644 --- a/sci-electronics/kicad-templates/Manifest +++ b/sci-electronics/kicad-templates/Manifest @@ -1,4 +1,2 @@ -DIST kicad-templates-5.1.12.tar.bz2 1552173 BLAKE2B 51791729e049aa835f15b80f783d07c099dd177783b1a78209e7c7db709a3b0a18bd22572227ab5193d4da955796bc4c78f502fdedd275f379f84fa49108a324 SHA512 4f44816fa78048c0db93ecd10ae980236bc5ef1ed5170270ac761dd5fc32d08a5c8bf733837e6dceecf736f75fa09780326af813de04cbd69345cf376815d430 -DIST kicad-templates-6.0.6.tar.gz 1057646 BLAKE2B 3bca2c6557ea8879d53a24a9a97872235c7d6289259936744a098745d0aaca9c2e397d471aa738d0007813c77e8a299c2975393bc0c0e62212be293cd210c049 SHA512 b9c4df8b7da9f5e3405a942c3afb09f5c387e311927042889211fb3c3a2a4610a1ccdc94ca2c1e1ae06e351617b15882adf5899f6dbfb392611feb5711e5be92 -DIST kicad-templates-6.0.7.tar.gz 1057666 BLAKE2B 62b6d6b93cf94c6085c69f349259eeaf9d7fdb9aa9faf631c4ee89de20d9f2c3d70e6afa9ff90ccaf9bbb3ad1877907d375ae6777dda3a841d3e263ea9edf2d6 SHA512 c04f2754d2ed8e18fdb054ecaa900a80f8f937096513dbe0a9dbd89c341490657ad673488bf9f3a3d0850861c99524127128b8efb1283e2df3feefcea8806d53 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 diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild deleted file mode 100644 index 211b692af0c3..000000000000 --- a/sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 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" -SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="CC-BY-SA-4.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=">=sci-electronics/kicad-5.1.0" diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.7.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.7.ebuild deleted file mode 100644 index fcdb94bb2f13..000000000000 --- a/sci-electronics/kicad-templates/kicad-templates-6.0.7.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 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 - 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" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - fi - - S="${WORKDIR}/${PN}-${MY_PV}" -fi - -LICENSE="CC-BY-SA-4.0" -SLOT="0" - -RDEPEND=">=sci-electronics/kicad-6.0.0" diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild index fcdb94bb2f13..d8f7f7a3b81b 100644 --- a/sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-6.0.9.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 @@ -16,7 +16,7 @@ else SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.6.ebuild b/sci-electronics/kicad-templates/kicad-templates-7.0.0.ebuild index 87f5461747d4..bffd6445a28e 100644 --- a/sci-electronics/kicad-templates/kicad-templates-6.0.6.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-7.0.0.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,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-9999.ebuild b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild index 4eb6a8bdae4c..db3c87def1eb 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-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,15 +11,9 @@ 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 ~x86" - fi - - S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi LICENSE="CC-BY-SA-4.0" diff --git a/sci-electronics/kicad-templates/metadata.xml b/sci-electronics/kicad-templates/metadata.xml index a93beae17f65..4005d5615c79 100644 --- a/sci-electronics/kicad-templates/metadata.xml +++ b/sci-electronics/kicad-templates/metadata.xml @@ -11,5 +11,6 @@ </maintainer> <upstream> <remote-id type="gitlab">kicad/libraries/kicad-templates</remote-id> + <remote-id type="github">kicad/kicad-templates</remote-id> </upstream> </pkgmetadata> diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index b1a0ea3ed005..92a0c48e970f 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,4 +1,2 @@ -DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea -DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c6666844c5bc9d0ec2 SHA512 c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a -DIST kicad-6.0.7.tar.gz 45143677 BLAKE2B 4ab9132be84cb6c6c566a826e5966f4fe64922dcd66f78c558126b37a276e075af80440da35071c864457298f6f964ba15511d0038424f473c3fb079d5f042e6 SHA512 0466650d166becbde23f1202e8bbe73ac7c743b5baad9608252fe4e960f0d15aad363664b69d840ef4568bf6d1c042b94252afce8657594a5f8193c979613e0e DIST kicad-6.0.9.tar.gz 45166663 BLAKE2B e4d45c589a8e76d7c121ac4ab7adefc5fd44d4ccbff7140196caec56c309f6e83d47a3ea9cf79f59de57c3bda43b3d32a2bea82c5850c2a7a58a6e1db27a06a7 SHA512 49e6bd3c9f6e0c9839c4fac18dc12dc7ef16183f6fbe8091992e2223c7fb085b3119d46797c0b0cf86fd2813e3c4def9eb1f2adbff1bf072a363f1a501da9354 +DIST kicad-7.0.0.tar.bz2 42583715 BLAKE2B 24fefe73bce6254bb47fdf21e8a82b7752e3f58cb3ea61220f0cf008c6570a4378f15bad54b81cc9257ec223bdb6128ccfd33f356e738b112c7b0e9481257255 SHA512 cb6f4cf6eee9a583d3a622bf8e48e5b604b047df0d742081cff1e5e387cf97cc1cd3f03fb58a17b44c47085634b95eea642bd1a6805e80807dbe0473c8d19d96 diff --git a/sci-electronics/kicad/files/kicad-5.1.5-help.patch b/sci-electronics/kicad/files/kicad-5.1.5-help.patch deleted file mode 100644 index 1b37e3013c1e..000000000000 --- a/sci-electronics/kicad/files/kicad-5.1.5-help.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt ---- kicad-5.1.5-orig/CMakeLists.txt 2019-11-14 09:09:45.000000000 -0800 -+++ kicad-5.1.5/CMakeLists.txt 2019-12-15 03:41:57.574995996 -0800 -@@ -442,6 +442,10 @@ - set( KIFACE_PREFIX "_" ) - #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX} KIFACE_PREFIX:${KIFACE_PREFIX}" ) - -+# KICAD_HELP is the location of the help files accessed from the UI -+# (usually provided via kicad-doc package) -+set ( KICAD_HELP share/doc/kicad -+ CACHE PATH "Alternative location of KiCad help files.") - - #================================================ - # Locations for install targets. -diff -Naur kicad-5.1.5-orig/CMakeModules/config.h.cmake kicad-5.1.5/CMakeModules/config.h.cmake ---- kicad-5.1.5-orig/CMakeModules/config.h.cmake 2019-11-14 09:09:45.000000000 -0800 -+++ kicad-5.1.5/CMakeModules/config.h.cmake 2019-12-15 03:42:00.368013375 -0800 -@@ -59,6 +59,10 @@ - /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX. - #define DEFAULT_INSTALL_PATH "@DEFAULT_INSTALL_PATH@" - -+/// KiCad help files path can be different on some systems allow adding alternative, -+/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad -+#define KICAD_HELP "@KICAD_HELP@" -+ - /// The wxPython version found during configuration. - #if defined( KICAD_SCRIPTING_WXPYTHON ) - #define WXPYTHON_VERSION "@WXPYTHON_VERSION@" -diff -Naur kicad-5.1.5-orig/common/searchhelpfilefullpath.cpp kicad-5.1.5/common/searchhelpfilefullpath.cpp ---- kicad-5.1.5-orig/common/searchhelpfilefullpath.cpp 2019-11-14 09:09:45.000000000 -0800 -+++ kicad-5.1.5/common/searchhelpfilefullpath.cpp 2019-12-15 03:42:03.168030796 -0800 -@@ -25,7 +25,7 @@ - - #include <pgm_base.h> - #include <common.h> --#include <config.h> // to define DEFAULT_INSTALL_PATH -+#include <config.h> // to define DEFAULT_INSTALL_PATH and KICAD_HELP - #include <macros.h> - #include <trace_helpers.h> - -@@ -69,6 +69,10 @@ - wxArrayString subdirs; - wxArrayString altsubdirs; - SEARCH_STACK ss = aSStack; -+#if ! defined(__WXMAC__) // && defined(__linux__) -+ SEARCH_STACK altss; -+ wxArrayString moresubdirs; -+#endif - - // It might already be in aSStack, but why depend on other code - // far away when it's so easy to add it again (to our copy) as the first place to look. -@@ -76,6 +80,7 @@ - // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during - // build configuration: - ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 ); -+ altss.AddPaths( wxT( KICAD_HELP ), 0 ); - - #if defined(__WXMAC__) - ss.AddPaths( GetOSXKicadMachineDataDir() ); -@@ -104,16 +109,17 @@ - - // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are - // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux. -- // This is ${KICAD_HELP} var in that CMakeLists.txt file. - // Below we account for an international subdirectory. - subdirs.Add( "share" ); - subdirs.Add( "doc" ); - subdirs.Add( "kicad" ); - subdirs.Add( "help" ); - -+ // For custom help path installations via ${KICAD_HELP} -+ moresubdirs.Add( "help" ); -+ - // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are - // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows. -- // This is ${KICAD_HELP} var in that CMakeLists.txt file. - // Below we account for an international subdirectory. - altsubdirs.Add( "doc" ); - altsubdirs.Add( "help" ); -@@ -159,6 +165,9 @@ - { - subdirs.Add( locale_name_dirs[ii] ); - altsubdirs.Add( locale_name_dirs[ii] ); -+#if ! defined(__WXMAC__) // && defined(__linux__) -+ moresubdirs.Add( locale_name_dirs[ii] ); -+#endif - - fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs ); - -@@ -188,8 +197,27 @@ - if( !fn.IsEmpty() ) - break; - -+#if ! defined(__WXMAC__) // && defined(__linux__) -+ fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs ); -+ -+ if( !fn.IsEmpty() ) -+ { -+ // Prepend URI protocol since we will open in a browser -+ fn = wxT( "file://" ) + fn; -+ break; -+ } -+ -+ fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs ); -+ -+ if( !fn.IsEmpty() ) -+ break; -+#endif -+ - subdirs.RemoveAt( subdirs.GetCount() - 1 ); - altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 ); -+#if ! defined(__WXMAC__) // && defined(__linux__) -+ moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 ); -+#endif - } - - return fn; diff --git a/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch deleted file mode 100644 index 1495037b1b72..000000000000 --- a/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt ---- kicad-5.1.5-orig/CMakeLists.txt 2019-11-14 09:09:45.000000000 -0800 -+++ kicad-5.1.5/CMakeLists.txt 2019-11-19 02:08:32.309282631 -0800 -@@ -355,10 +355,10 @@ - - elseif( NOT APPLE ) - # Thou shalt not link vaporware and tell us it's a valid DSO (apple ld doesn't support it) -- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) -- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) -+ set( CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" ) -+ set( CMAKE_MODULE_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" ) - -- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" ) -+ set( CMAKE_EXE_LINKER_FLAGS_RELEASE "$ENV{LDFLAGS} -s" ) - - # Defeat ELF's ability to use the GOT to replace locally implemented functions - # with ones from another module. diff --git a/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch b/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch deleted file mode 100644 index b01a6b7d79f6..000000000000 --- a/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp -index b265e2363..eb1187d86 100644 ---- a/eeschema/dialogs/dialog_spice_model.cpp -+++ b/eeschema/dialogs/dialog_spice_model.cpp -@@ -34,6 +34,7 @@ - #include <wx/wupdlock.h> - - #include <cctype> -+#include <cstring> - - // Helper function to shorten conditions - static bool empty( const wxTextCtrl* aCtrl ) -@@ -804,9 +804,11 @@ bool DIALOG_SPICE_MODEL::addPwlValue( const wxString& aTime, const wxString& aVa - float timeF; - m_pwlTime->GetValue().ToDouble( &timeD ); - timeF = timeD; -+ long data; -+ std::memcpy( &data, &timeF, sizeof( timeF ) ); - - // Store the time value, so the entries can be sorted -- m_pwlValList->SetItemData( idx, *reinterpret_cast<long*>( &timeF ) ); -+ m_pwlValList->SetItemData( idx, data ); - - // Sort items by timestamp - m_pwlValList->SortItems( comparePwlValues, -1 ); diff --git a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch deleted file mode 100644 index 675ff749de8d..000000000000 --- a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur kicad-5.1.6-orig/CMakeLists.txt kicad-5.1.6/CMakeLists.txt ---- kicad-5.1.6-orig/CMakeLists.txt 2020-05-11 11:27:08.000000000 -0700 -+++ kicad-5.1.6/CMakeLists.txt 2020-05-25 20:45:57.199559075 -0700 -@@ -929,7 +929,7 @@ - set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime ) - set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons ) - set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications ) -- set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/appdata ) -+ set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/metainfo ) - - # Install Mime directory - install( DIRECTORY ${UNIX_ICON_FILES} -diff -Naur kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake ---- kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake 2020-05-11 11:27:08.000000000 -0700 -+++ kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake 2020-05-25 20:54:51.927438936 -0700 -@@ -36,11 +36,11 @@ - string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" ) - - # Configure the KiCad appdata file --configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/appdata/kicad.appdata.xml.in -- ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml -+configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/metainfo/kicad.appdata.xml.in -+ ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml - @ONLY ) - - # Ensure the file was configured successfully --if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml ) -+if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml ) - message( FATAL_ERROR "Configuration failed to write file kicad.appdata.xml." ) - endif() diff --git a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch new file mode 100644 index 000000000000..f1047cb9dee5 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch @@ -0,0 +1,30 @@ +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-werror.patch b/sci-electronics/kicad/files/kicad-7.0.0-werror.patch new file mode 100644 index 000000000000..b5fa3b1ae15d --- /dev/null +++ b/sci-electronics/kicad/files/kicad-7.0.0-werror.patch @@ -0,0 +1,21 @@ +From 04fc6081bd3d6575d00589f71150ab796778a9c9 Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matthew@gentoo.org> +Date: Mon, 20 Feb 2023 17:53:50 +0000 +Subject: [PATCH] build: Remove Werror flag from clipper2 + +Bug: https://bugs.gentoo.org/895014 + +--- a/thirdparty/clipper2/CMakeLists.txt ++++ b/thirdparty/clipper2/CMakeLists.txt +@@ -27,7 +27,7 @@ target_compile_definitions(clipper2 PUBLIC USINGZ) + if (MSVC) + target_compile_options(clipper2 PRIVATE /W4 /WX) + else() +- target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror) ++ target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic) + target_link_libraries(clipper2 PUBLIC -lm) + endif() + +-- +2.39.2 + 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 new file mode 100644 index 000000000000..9ef12e97b573 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch @@ -0,0 +1,95 @@ +From b536580119c59fde78e38d8d6388f2540ecb6cf9 Mon Sep 17 00:00:00 2001 +From: Ian McInerney <ian.s.mcinerney@ieee.org> +Date: Mon, 13 Feb 2023 21:24:26 +0000 +Subject: [PATCH] Support subrelease field in wxWidgets cmake detection + +Sometimes wxWidgets increments the subrelease to a non-zero value, and +since wxPython will report a subrelease, we must ensure we can get the +subrelease from the wx library properly, otherwise configure will fail +thinking the library isn't the same version as that used by wxPython. + +Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13887 +--- a/cmake/FindwxWidgets.cmake ++++ b/cmake/FindwxWidgets.cmake +@@ -926,8 +926,17 @@ if(wxWidgets_FOUND) + "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" ) + string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*" + "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" ) +- set(wxWidgets_VERSION_STRING +- "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" ) ++ string(REGEX REPLACE "^(.*\n)?#define +wxSUBRELEASE_NUMBER +([0-9]+).*" ++ "\\2" wxWidgets_VERSION_SUBRELEASE "${_wx_version_h}" ) ++ ++ if( ${wxWidgets_VERSION_SUBRELEASE} GREATER 0 ) ++ set(wxWidgets_VERSION_STRING ++ "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}.${wxWidgets_VERSION_SUBRELEASE}" ) ++ else() ++ set(wxWidgets_VERSION_STRING ++ "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" ) ++ endif() ++ + DBG_MSG("wxWidgets_VERSION_STRING: ${wxWidgets_VERSION_STRING}") + endif() + +-- +From 1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c Mon Sep 17 00:00:00 2001 +From: Ian McInerney <ian.s.mcinerney@ieee.org> +Date: Tue, 14 Feb 2023 00:18:56 +0000 +Subject: [PATCH] Relax wxPython version mismatch check to major.minor + +The previous version check failed when the version was even slightly +different, including on the revision field. Theoretically the ABI of the +wx minor versions in use should be the same, so this might work. On the +other hand, with wxPython it could break as well. YOLO. +--- a/scripting/python_scripting.cpp ++++ b/scripting/python_scripting.cpp +@@ -50,6 +50,7 @@ + #include <kiplatform/environment.h> + + #include <wx/app.h> ++#include <wx/regex.h> + #include <wx/utils.h> + + #include <config.h> +@@ -128,7 +129,39 @@ except: + wxVI.GetMajor(), wxVI.GetMinor(), wxVI.GetMicro() ); + version = version.Mid( idx + 10 ); + +- if( wxVersion.Cmp( version ) != 0 ) ++ int wxPy_major = 0; ++ int wxPy_minor = 0; ++ int wxPy_micro = 0; ++ int wxPy_rev = 0; ++ ++ // Compile a regex to extract the wxPython version ++ wxRegEx re( "([0-9]+)\\.([0-9]+)\\.?([0-9]+)?\\.?([0-9]+)?" ); ++ wxASSERT( re.IsValid() ); ++ ++ if( re.Matches( version ) ) ++ { ++ wxString v = re.GetMatch( version, 1 ); ++ ++ if( !v.IsEmpty() ) ++ v.ToInt( &wxPy_major ); ++ ++ v = re.GetMatch( version, 2 ); ++ ++ if( !v.IsEmpty() ) ++ v.ToInt( &wxPy_minor ); ++ ++ v = re.GetMatch( version, 3 ); ++ ++ if( !v.IsEmpty() ) ++ v.ToInt( &wxPy_micro ); ++ ++ v = re.GetMatch( version, 4 ); ++ ++ if( !v.IsEmpty() ) ++ v.ToInt( &wxPy_rev ); ++ } ++ ++ if( ( wxVI.GetMajor() != wxPy_major ) || ( wxVI.GetMinor() != wxPy_minor ) ) + { + wxString msg = wxT( "The wxPython library was compiled against wxWidgets %s but KiCad is " + "using %s. Python plugins will not be available." ); +-- diff --git a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild deleted file mode 100644 index a601eb206a59..000000000000 --- a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8,9} ) - -WX_GTK_VER="3.0-gtk3" - -inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils - -DESCRIPTION="Electronic Schematic and PCB design tools" -HOMEPAGE="https://www.kicad.org" -SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2+ GPL-3+ Boost-1.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc examples github ngspice +occ openmp +python" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" -# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301 -COMMON_DEPEND=" - dev-libs/boost:=[context,nls] - media-libs/freeglut - media-libs/glew:0= - >=media-libs/glm-0.9.9.1 - media-libs/mesa[X(+)] - >=x11-libs/cairo-1.8.8:= - >=x11-libs/pixman-0.30 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - github? ( net-misc/curl:=[ssl] ) - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) - occ? ( <sci-libs/opencascade-7.5.3:0=[vtk(+)] ) - python? ( - $(python_gen_cond_dep ' - dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] - dev-python/wxpython:4.0[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - ) -" -DEPEND="${COMMON_DEPEND} - python? ( >=dev-lang/swig-3.0:0 )" -RDEPEND="${COMMON_DEPEND} - sci-electronics/electronics-menu -" -BDEPEND="doc? ( app-doc/doxygen )" -CHECKREQS_DISK_BUILD="800M" - -PATCHES=( - "${FILESDIR}/${PN}-5.1.5-help.patch" - "${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch" - "${FILESDIR}/${PN}-5.1.6-metainfo.patch" - "${FILESDIR}/${PN}-5.1.5-ldflags.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - use python && python-single-r1_pkg_setup - setup-wxwidgets - check-reqs_pkg_setup -} - -src_unpack() { - default_src_unpack - # For the metainfo patch to work the kicad.appdata.xml has to be moved to - # avoid QA issue. This is needed because /usr/share/appdata location is - # deprecated, it should not be used anymore by new software. - # Appdata/Metainfo files should be installed into /usr/share/metainfo - # directory. as per - # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html - mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed" -} - -src_prepare() { - # Fix OpenCASCADE lookup - sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \ - -e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \ - -i CMakeModules/FindOpenCASCADE.cmake || die - - cmake_src_prepare -} - -src_configure() { - xdg_environment_reset - - local mycmakeargs=( - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}" - -DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" - -DBUILD_GITHUB_PLUGIN="$(usex github)" - -DKICAD_SCRIPTING="$(usex python)" - -DKICAD_SCRIPTING_MODULES="$(usex python)" - -DKICAD_SCRIPTING_WXPYTHON="$(usex python)" - -DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)" - -DKICAD_SCRIPTING_PYTHON3="$(usex python)" - -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)" - -DKICAD_SPICE="$(usex ngspice)" - -DKICAD_USE_OCC="$(usex occ)" - -DKICAD_INSTALL_DEMOS="$(usex examples)" - -DCMAKE_SKIP_RPATH="ON" - ) - use python && mycmakeargs+=( - -DPYTHON_DEST="$(python_get_sitedir)" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - ) - if use occ; then - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade - ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - cmake_src_compile dev-docs doxygen-docs - fi -} - -src_install() { - cmake_src_install - use python && python_optimize - if use doc ; then - dodoc uncrustify.cfg - cd Documentation || die - dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/. - fi -} - -src_test() { - # Test cannot find library in Portage's sandbox. Let's create a link so test can run. - ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die - - default -} - -pkg_postinst() { - optfeature "Component symbols library" sci-electronics/kicad-symbols - optfeature "Component footprints library" sci-electronics/kicad-footprints - optfeature "3D models of components " sci-electronics/kicad-packages3d - optfeature "Project templates" sci-electronics/kicad-templates - optfeature "Different languages for GUI" sci-electronics/kicad-i18n - optfeature "Extended documentation" app-doc/kicad-doc - optfeature "Creating 3D models of components" media-gfx/wings - - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} diff --git a/sci-electronics/kicad/kicad-6.0.6.ebuild b/sci-electronics/kicad/kicad-6.0.6.ebuild deleted file mode 100644 index ca3edd939568..000000000000 --- a/sci-electronics/kicad/kicad-6.0.6.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -WX_GTK_VER="3.0-gtk3" - -inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils - -DESCRIPTION="Electronic Schematic and PCB design tools" -HOMEPAGE="https://www.kicad.org" - -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.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 ~arm64 ~riscv ~x86" - fi -fi - -# BSD for bundled pybind -LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" -SLOT="0" -IUSE="doc examples ngspice nls openmp +occ +pcm" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Contains bundled pybind but it's patched for wx -# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424 -# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301 -COMMON_DEPEND=" - !sci-electronics/kicad-i18n - dev-libs/boost:=[context,nls] - media-libs/freeglut - media-libs/glew:0= - >=media-libs/glm-0.9.9.1 - media-libs/mesa[X(+)] - >=x11-libs/cairo-1.8.8:= - >=x11-libs/pixman-0.30 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - $(python_gen_cond_dep ' - dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] - dev-python/wxpython:4.0[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) - nls? ( - sys-devel/gettext - ) - occ? ( - >=sci-libs/opencascade-7.3.0:0= - ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - sci-electronics/electronics-menu -" -BDEPEND=">=dev-lang/swig-3.0 - doc? ( app-doc/doxygen )" - -if [[ ${PV} == 9999 ]] ; then - # x11-misc-util/macros only required on live ebuilds - BDEPEND+=" >=x11-misc/util-macros-1.18" -fi - -CHECKREQS_DISK_BUILD="900M" - -PATCHES=( - "${FILESDIR}/${PN}-scripts-install-fix.patch" - "${FILESDIR}/${P}-unitialized-variable-fix.patch" -) - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - python-single-r1_pkg_setup - setup-wxwidgets - check-reqs_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - else - default_src_unpack - fi -} - -src_configure() { - xdg_environment_reset - - local mycmakeargs=( - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" - - -DKICAD_SCRIPTING_WXPYTHON=ON - - # Merged from separate -i18n package, bug #830274 - -DKICAD_BUILD_I18N="$(usex nls)" - -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" - - -DPYTHON_DEST="$(python_get_sitedir)" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - - -DKICAD_SPICE="$(usex ngspice)" - -DKICAD_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 - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - cmake_src_compile doxygen-docs - fi -} - -src_test() { - # Test cannot find library in Portage's sandbox. Let's create a link so test can run. - ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die - - # LD_LIBRARY_PATH is there to help it pick up the just-built libraries - LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test -} - -src_install() { - cmake_src_install - python_optimize - - 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/. - 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-6.0.9.ebuild b/sci-electronics/kicad/kicad-6.0.9.ebuild index 7471c53d9dbd..acb95eeca5df 100644 --- a/sci-electronics/kicad/kicad-6.0.9.ebuild +++ b/sci-electronics/kicad/kicad-6.0.9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) WX_GTK_VER="3.0-gtk3" inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils @@ -21,7 +21,7 @@ else S="${WORKDIR}/${PN}-${MY_PV}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm64 ~riscv ~x86" fi fi @@ -77,6 +77,7 @@ CHECKREQS_DISK_BUILD="900M" PATCHES=( "${FILESDIR}/${PN}-scripts-install-fix.patch" "${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch" + "${FILESDIR}/${PN}-6.0.9-gcc-13.patch" ) pkg_setup() { diff --git a/sci-electronics/kicad/kicad-6.0.7.ebuild b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild index 7471c53d9dbd..a6db98a4f37a 100644 --- a/sci-electronics/kicad/kicad-6.0.7.ebuild +++ b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -WX_GTK_VER="3.0-gtk3" +PYTHON_COMPAT=( python3_{9..10} ) +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,7 +28,7 @@ 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 +ngspice nls openmp" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -36,18 +36,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424 # Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301 COMMON_DEPEND=" - !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= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + sys-libs/zlib $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] - dev-python/wxpython:4.0[${PYTHON_USEDEP}] + ~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} ngspice? ( @@ -56,15 +59,12 @@ COMMON_DEPEND=" nls? ( sys-devel/gettext ) - occ? ( - >=sci-libs/opencascade-7.3.0:0= - ) " DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " -BDEPEND=">=dev-lang/swig-3.0 +BDEPEND=">=dev-lang/swig-4.0 doc? ( app-doc/doxygen )" if [[ ${PV} == 9999 ]] ; then @@ -75,8 +75,10 @@ fi CHECKREQS_DISK_BUILD="900M" PATCHES=( - "${FILESDIR}/${PN}-scripts-install-fix.patch" - "${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch" + # https://bugs.gentoo.org/895188 + "${FILESDIR}"/${PN}-7.0.0-wxwidgets-version.patch + + "${FILESDIR}"/${PN}-7.0.0-werror.patch ) pkg_setup() { @@ -102,8 +104,8 @@ src_configure() { -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" -DKICAD_SCRIPTING_WXPYTHON=ON + -DKICAD_USE_EGL=ON - # Merged from separate -i18n package, bug #830274 -DKICAD_BUILD_I18N="$(usex nls)" -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" @@ -113,14 +115,10 @@ src_configure() { -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 ) @@ -147,10 +145,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 } @@ -159,6 +158,7 @@ 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-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index 4f5c4e7284ce..0a613e92f79e 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -WX_GTK_VER="3.0-gtk3" +PYTHON_COMPAT=( python3_{9..10} ) +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,7 +28,7 @@ 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 +ngspice nls openmp" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -36,18 +36,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424 # Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301 COMMON_DEPEND=" - !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= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + sys-libs/zlib $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] - dev-python/wxpython:4.0[${PYTHON_USEDEP}] + ~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} ngspice? ( @@ -56,15 +59,12 @@ COMMON_DEPEND=" nls? ( sys-devel/gettext ) - occ? ( - >=sci-libs/opencascade-7.3.0:0= - ) " DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " -BDEPEND=">=dev-lang/swig-3.0 +BDEPEND=">=dev-lang/swig-4.0 doc? ( app-doc/doxygen )" if [[ ${PV} == 9999 ]] ; then @@ -74,6 +74,10 @@ fi CHECKREQS_DISK_BUILD="900M" +PATCHES=( + "${FILESDIR}"/${PN}-7.0.0-werror.patch +) + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -97,8 +101,8 @@ src_configure() { -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" -DKICAD_SCRIPTING_WXPYTHON=ON + -DKICAD_USE_EGL=ON - # Merged from separate -i18n package, bug #830274 -DKICAD_BUILD_I18N="$(usex nls)" -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" @@ -108,14 +112,10 @@ src_configure() { -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 ) @@ -142,10 +142,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/metadata.xml b/sci-electronics/kicad/metadata.xml index a75b4ff9ecf1..36c0a94d2d79 100644 --- a/sci-electronics/kicad/metadata.xml +++ b/sci-electronics/kicad/metadata.xml @@ -10,10 +10,8 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="github">Add github support into PCB editor</flag> <flag name="ngspice">Enable circuit simulation</flag> <flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag> - <flag name="python">Enable python scripting support</flag> <flag name="pcm">Enable plugin content manager</flag> </use> <longdescription> diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index 06d674ca2e45..0a10a45e75f9 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -1,2 +1,2 @@ -DIST klayout-0.27.10.tar.gz 57428098 BLAKE2B 3f64ed6a65ec7d2732691594f50d02f160725a3306cd0d0593f8c2b5978d5cf76e004ed3347bb6e9d9473b8e0974bc04de101ec3bf168faf147e6c64c5f0bdcb SHA512 a637b0a0bd1eaa3c858c333791c5592bc8a4dc1db7413b83432d7bedce9ba7e1210c76086a4f39504bc23a11778a45370b86262c88daa579517e1dee940ecda7 DIST klayout-0.27.12.tar.gz 57616686 BLAKE2B 18c69c799412554547f9b671c80f097b93b15fb04272c4ea6f06b54783fa97ac0da5f50ea61fbf88e75e5436524c9271ffdb7560911b7b8e130a4a287ba2cf60 SHA512 25bb854b9f265801a9ee13bdead0ae1fa4ce21bd0d018c10b0c89aff72f48d4131e80987750bd47e3996296ced1936fffb4ed02daa5a7bdff5f05ae6e820e067 +DIST klayout-0.28.5.tar.gz 88218961 BLAKE2B 59154bc1cc6596c4deb10b9c59f8957c2fcb8815b8d8ab09e79521a2e281e82d5437a222a48e0f378188b34162cd92229694c58e15ff74b6cde4c2b65df7bfe7 SHA512 ae2f4a08d8939eccba41f2a76ef3e1a97bdd61925329f3d3c314206dfc2783e0db0ffad58cc1357355f0853079987b9c083dde78ae29914b4db8aadc24181082 diff --git a/sci-electronics/klayout/klayout-0.27.12.ebuild b/sci-electronics/klayout/klayout-0.27.12.ebuild index 8aceae0ea200..87201edfa6b9 100644 --- a/sci-electronics/klayout/klayout-0.27.12.ebuild +++ b/sci-electronics/klayout/klayout-0.27.12.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} else SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" diff --git a/sci-electronics/klayout/klayout-0.27.10.ebuild b/sci-electronics/klayout/klayout-0.28.5.ebuild index 9f245e2a3545..8aceae0ea200 100644 --- a/sci-electronics/klayout/klayout-0.27.10.ebuild +++ b/sci-electronics/klayout/klayout-0.28.5.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 RUBY_OPTIONAL=no USE_RUBY="ruby27" # note: define maximally ONE implementation here -PYTHON_COMPAT=( python3_{8,9,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11} ) inherit toolchain-funcs python-single-r1 ruby-ng @@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} else SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest index a7f556f1ccd3..7c77e2332aac 100644 --- a/sci-electronics/magic/Manifest +++ b/sci-electronics/magic/Manifest @@ -1,3 +1,4 @@ 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/magic-8.3.232.ebuild b/sci-electronics/magic/magic-8.3.232-r1.ebuild index a23b43b71b8d..d3876aa9ad6e 100644 --- a/sci-electronics/magic/magic-8.3.232.ebuild +++ b/sci-electronics/magic/magic-8.3.232-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=8 @@ -21,7 +21,7 @@ RDEPEND="sys-libs/ncurses:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt - cairo? ( x11-libs/cairo[opengl?] ) + cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl diff --git a/sci-electronics/magic/magic-8.3.309.ebuild b/sci-electronics/magic/magic-8.3.309-r2.ebuild index 2f0d828f97bb..b615a42ae11d 100644 --- a/sci-electronics/magic/magic-8.3.309.ebuild +++ b/sci-electronics/magic/magic-8.3.309-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-any-r1 @@ -27,7 +27,7 @@ RDEPEND=" dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt - cairo? ( x11-libs/cairo[opengl?] ) + cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl diff --git a/sci-electronics/magic/magic-8.3.309-r1.ebuild b/sci-electronics/magic/magic-8.3.309-r3.ebuild index daeca5ef9e93..1b40c505933c 100644 --- a/sci-electronics/magic/magic-8.3.309-r1.ebuild +++ b/sci-electronics/magic/magic-8.3.309-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-any-r1 @@ -27,7 +27,7 @@ RDEPEND=" dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt - cairo? ( x11-libs/cairo[opengl?] ) + cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl diff --git a/sci-electronics/magic/magic-8.3.365.ebuild b/sci-electronics/magic/magic-8.3.365.ebuild new file mode 100644 index 000000000000..feb879ad8924 --- /dev/null +++ b/sci-electronics/magic/magic-8.3.365.ebuild @@ -0,0 +1,98 @@ +# 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" + +# https://bugs.gentoo.org/887691 +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 + ) + !net-misc/ipsorcery +" +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/osqoop/metadata.xml b/sci-electronics/osqoop/metadata.xml index 115e9d64a669..25ca9d853448 100644 --- a/sci-electronics/osqoop/metadata.xml +++ b/sci-electronics/osqoop/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="github">sandsmark/osqoop</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest index 340ef2eb2ae0..982f8701dd3f 100644 --- a/sci-electronics/pcb/Manifest +++ b/sci-electronics/pcb/Manifest @@ -1 +1,2 @@ DIST pcb-4.2.2.tar.gz 5182807 BLAKE2B e2a9ab7fdeb402d9d07717fbc2ad4b31594aada95693c2a7046c73364a43591ee1a537f0cbda67bf46e39d53c61a454f146963fe14a4661fe2ffbc11c2eab99f SHA512 c76fc053fbb0a8a9b7aef494a37d3587efaa2023affd32c3cce895632a7e68fbb85f8862cff8349c7d281365379c07a5471c9467c5977a7aa053a83fc6499c55 +DIST pcb-4.3.0.tar.gz 5383782 BLAKE2B 745db23f9a578b4e785ccaca2f5acccbe83fcd94bfaf34f594fd7fe3ec68d0fe4183f2d705f0a3fb32b1f07b6a4af657ab27cda7b70d652072365828e0a07289 SHA512 eaee631c7c2d0a8047e95634ac1a3892fa38d621d7fd3c8aafaaa05692cf6e6a92ea5733bf512631f9f8c2ff5b6dbeeda7f304cd35cfb771d339976842d64039 diff --git a/sci-electronics/pcb/pcb-4.3.0.ebuild b/sci-electronics/pcb/pcb-4.3.0.ebuild new file mode 100644 index 000000000000..80f27c1fb2ba --- /dev/null +++ b/sci-electronics/pcb/pcb-4.3.0.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2" +SLOT="0" +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 )" + +RDEPEND=" + dev-libs/glib:2 + sci-electronics/electronics-menu + gif? ( media-libs/gd ) + gsvit? ( media-libs/gd[png] ) + gui? ( + x11-libs/gtk+:2 + x11-libs/pango + dbus? ( sys-apps/dbus ) + ) + jpeg? ( media-libs/gd[jpeg] ) + nelma? ( media-libs/gd[png] ) + gcode? ( media-libs/gd[png] ) + virtual/libintl + png? ( media-libs/gd[png] ) + m4lib-png? ( media-libs/gd[png] ) + tk? ( >=dev-lang/tk-8:0 )" +#toporouter-output? ( x11-libs/cairo ) + +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/intltool-0.35 + virtual/pkgconfig + sys-devel/gettext + test? ( + sci-electronics/gerbv + virtual/imagemagick-tools + )" + +PATCHES=( "${FILESDIR}"/${PN}-4.2.2-fix-autotools.patch ) + +src_prepare() { + default + eautoreconf + + # tests are unconditional, even in the known presence of missing/disabled + # features, so we have to remove feature tests ourselves. + if ! use gcode; then + sed -i '/^hid_gcode/d' tests/tests.list || die + fi + if ! use gsvit; then + sed -i '/^hid_gsvit/d' tests/tests.list || die + fi + if ! use nelma; then + sed -i '/^hid_nelma/d' tests/tests.list || die + fi + if ! use png; then + sed -i '/^hid_png/d' tests/tests.list || die + fi + if ! use gif; then + sed -i '/^hid_png10[[:digit:]]/d' tests/tests.list || die + fi + if ! use jpeg; then + sed -i '/^hid_png20[[:digit:]]/d' tests/tests.list || die + fi +} + +src_configure() { + local exporters=( bom gerber ps ipcd356 ) + if use png || use jpeg || use gif; then + exporters+=( png ) + fi + use gcode && exporters+=( gcode ) + use gsvit && exporters+=( gsvit ) + use nelma && exporters+=( nelma ) + use tk || export WISH="${EPREFIX}/bin/true" + + # toporouter-output USE flag removed, seems to do nothing + # opengl disabled unconditionally, due to requiring EOL gtkglext + econf \ + --disable-gl \ + --disable-rpath \ + --disable-toporouter-output \ + --disable-update-mime-database \ + --disable-update-desktop-database \ + --disable-xrender \ + --enable-nls \ + $(use_enable doc) \ + $(use_enable gif) \ + $(use_enable jpeg) \ + $(use_enable png) \ + $(use_enable m4lib-png) \ + $(use_enable toporouter) \ + $(use_enable gui dbus $(usex dbus yes no)) \ + --with-gui=$(usex gui gtk batch) \ + --with-exporters="${exporters[*]}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_test() { + virtx emake check +} diff --git a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild index 8e5713ee00e8..6d68a3f229f6 100644 --- a/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild +++ b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" inherit cmake xdg-utils diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild index 08b7cf0d812d..5def86e1cebb 100644 --- a/sci-electronics/pulseview/pulseview-9999.ebuild +++ b/sci-electronics/pulseview/pulseview-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" inherit cmake xdg-utils 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 730463965c90..148370c0f790 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,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit xdg-utils diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild index 730463965c90..148370c0f790 100644 --- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild +++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit xdg-utils diff --git a/sci-electronics/voacapl/metadata.xml b/sci-electronics/voacapl/metadata.xml index 001997549c54..2bbb21a0d132 100644 --- a/sci-electronics/voacapl/metadata.xml +++ b/sci-electronics/voacapl/metadata.xml @@ -5,4 +5,7 @@ <email>tomjbe@gentoo.org</email> <name>Thomas Beierlein</name> </maintainer> + <upstream> + <remote-id type="github">jawatson/voacapl</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild index 53f2437a3ea8..829abdbfcb48 100644 --- a/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild +++ b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit fortran-2 +inherit autotools fortran-2 MY_P=${PN}-v.${PV} @@ -20,6 +20,11 @@ RESTRICT="mirror bindist" S="${WORKDIR}/${MY_P}" +src_prepare() { + eapply_user + eautoreconf +} + src_compile() { # bug 513766 emake -j1 diff --git a/sci-electronics/xcircuit/xcircuit-3.10.30.ebuild b/sci-electronics/xcircuit/xcircuit-3.10.30-r1.ebuild index 2f9ba567b768..b4cf6a10fb70 100644 --- a/sci-electronics/xcircuit/xcircuit-3.10.30.ebuild +++ b/sci-electronics/xcircuit/xcircuit-3.10.30-r1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ppc x86" IUSE="tcl" DEPEND=" - app-text/ghostscript-gpl + app-text/ghostscript-gpl:= media-libs/fontconfig:1.0= sys-libs/zlib:= x11-libs/cairo diff --git a/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild index edc8563c6bd0..7f956b3139c9 100644 --- a/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild +++ b/sci-electronics/xnec2c/xnec2c-4.4.12.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 @@ -25,8 +25,11 @@ 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 |