diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /sci-electronics | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'sci-electronics')
49 files changed, 845 insertions, 305 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex bf80fab02a3c..299eaa459641 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest index 51b7a339457c..57855318999a 100644 --- a/sci-electronics/eagle/Manifest +++ b/sci-electronics/eagle/Manifest @@ -1,5 +1,7 @@ AUX eagle_wrapper_script 247 BLAKE2B 62fb49b87be84527b983473c7f9876da75a037cb82321de16a3fd49d8d8dbab875bcf9837537520103c4f9a26369b3be6e331ea910bb7d582aadd6311e9b36ab SHA512 a347dc4f4ec8f369ff6a1beb8eaf3dfc9f4d8c2de3fe8b33b0f662cfb469905b17a72d5273c4627bc8a3fee9ef650654d1d654d33ea3a01c4f9a2ef57961256d +DIST Autodesk_EAGLE_9.6.2_English_Linux_64bit.tar.gz 171780187 BLAKE2B 6fb627448068b8af8fb2a4117c84386a300acef769afe8524cae703afb09edf719f19fc4a5298d091667f3d4c09e8ec06a0da4a16274cb6e6c64a1ae349ed014 SHA512 4ef17dfa52b1ee0f5ba68896bc3821616a1b7d1a073a586604271cd7129e29671c480cd324cc5eadc517eb300ca4be6efa69423a306944e36732c2aa34cc59a3 DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c61891ebab7e3f59d41aaa0c6ecaea2f050ced62552656a2311542fee497dbe8fbe43c958a8e76a9b00217c430f678072 SHA512 7ebe73bcd71857c5b8087e911ebfc45507715725abab15b80c9800476128790f8e373d01c52c05a87102597d355390ca0687964eff74af1283b162fba8dbb53b DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770 EBUILD eagle-7.7.0-r1.ebuild 3578 BLAKE2B 92216fcc1c4937eecbb7a3a5c8ea15e978f65d0597444698e4b9c64b7eb2e2e2cb67356e2cbc5b2a4f529abacca699155a1815a70cd4883111df1d0e48f78817 SHA512 8ca3563ada5a7779ec35ee2360aa914764597f159f31bae7297fce03a214170db9dd74da0e12d35e761564f6e33eb8e17cdb15bde6760beca37975394c0a3369 +EBUILD eagle-9.6.2-r2.ebuild 2279 BLAKE2B b1733b1b564a20b54d898a720a5361345d179e85d4605d1d7e1c94b182b6d3f7c882ea9cb88a31196ea0b62b3091663a9e990b441d7fca87e4776c1068d6dcb2 SHA512 85bf0976edc2f749d1219d3f1da0d0f55782537fd0727477997df2e278998b0732d0e1db7be538f6295dec4a8de0ad25cf094e3ea008a454ebb330e703f52bd0 MISC metadata.xml 672 BLAKE2B ff4a5feffa8823f7984b1e59111b17359a8fc8fd01b2e39becc437b39192b0a4b8aa5416fea2aeb2027df42cd892261dd482c627ce8abeb80886b13c14dc8283 SHA512 33949d396dfb4c87e0dcf8dd4ba677ecb0535e512e295385558f1abd8a5808572727efbacf5996aaf1b2bb1fa4ef65cddf7385a433363b2030cde19551ba8334 diff --git a/sci-electronics/eagle/eagle-9.6.2-r2.ebuild b/sci-electronics/eagle/eagle-9.6.2-r2.ebuild new file mode 100644 index 000000000000..df1ec6a67641 --- /dev/null +++ b/sci-electronics/eagle/eagle-9.6.2-r2.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop optfeature xdg + +DESCRIPTION="Autodesk EAGLE schematic and printed circuit board (PCB) layout editor" +HOMEPAGE="https://www.autodesk.com/" +SRC_URI="https://eagle-updates.circuits.io/downloads/${PV//./_}/Autodesk_EAGLE_${PV}_English_Linux_64bit.tar.gz" + +LICENSE="Autodesk" +SLOT="0" +KEYWORDS="-* ~amd64" + +QA_PREBUILT="opt/${PN}/*" +RESTRICT="mirror bindist" + +RDEPEND=" + app-crypt/mit-krb5 + dev-libs/expat + dev-libs/glib + dev-libs/libpcre + dev-libs/nspr + dev-libs/nss + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebchannel:5 + dev-qt/qtwebengine:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + media-libs/libglvnd + media-libs/mesa + net-dns/avahi + net-print/cups + sys-apps/dbus + sys-apps/keyutils + || ( >=sys-fs/e2fsprogs-1.46.5 sys-libs/e2fsprogs-libs ) + sys-libs/glibc + sys-libs/zlib + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libxshmfence + x11-libs/libXtst +" + +src_prepare() { + default + # drop bundled ngpsice + rm -r ngspice || die + # drop bundled qt and other libs + rm qt.conf || die + rm -r resources plugins libexec || die + # this libSuits.so(?) is not packaged anywhere in Gentoo so we keep it + mv lib lib.back || die + mkdir lib || die + mv lib.back/libSuits.so lib/ || die + rm -r lib.back || die +} + +src_install() { + dodoc doc/*.txt doc/*.pdf doc/ulp/*.pdf + doman doc/eagle.1 + dodir /opt/${PN} + + # copy everything in + cp -a "${S}/"* "${ED}/opt/${PN}/" || die + fperms 0755 /opt/${PN}/${PN} + # and make convenience symlink + dosym "../${PN}/${PN}" "/opt/bin/${PN}" + + # Create desktop entry + doicon -s 128x128 bin/${PN}-logo.png + make_desktop_entry ${PN} "CadSoft EAGLE Layout Editor" ${PN}-logo "Graphics;Electronics" +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature 'SPICE circuit simulation support (set "Simulator Path" in Options -> Directories)' sci-electronics/ngspice +} diff --git a/sci-electronics/electronics-menu/Manifest b/sci-electronics/electronics-menu/Manifest index 2d37e054a093..483e3f50c4fd 100644 --- a/sci-electronics/electronics-menu/Manifest +++ b/sci-electronics/electronics-menu/Manifest @@ -1,3 +1,3 @@ DIST electronics-menu-1.0.tar.gz 12284 BLAKE2B 767aa286375b509879d784f82290f3fac8bad0614466a566405ce67f2f06e5b04272cbd58410655dd258dfee9eb6b4cf3af0e9b5a00a247cd79165968dd06dd6 SHA512 c4619d6dfd0641da772a7026af50b0ba1ededee6a5be84ede1c058671764f8c9a7d55e44a018f6bd42bbef0a29d513df5e9056a9a345999a2493fa62d2300b0a -EBUILD electronics-menu-1.0-r1.ebuild 332 BLAKE2B 80537b2de0f607889f7b4b8b5eba373f67f9f177403988b6e2f75d58a9b22a7abe99788577f7f89ace0838603e6ccec02a4a55512f3f8632ed62eaf53aa18a59 SHA512 99c635dd7f7a5c8e931c5e3ba570bfcaa6e4e82ac8bd4f3cc9f9b8f38fb3d6fc02f508c65c03da4f17537d280913552a675c7b6837bb7ced7ae16f1b4c50b577 +EBUILD electronics-menu-1.0-r1.ebuild 339 BLAKE2B 9187dc1df84665a6638aac786542e53fc534ac3d9e4308fc3e0be64d6dbb3702af5d16b3c84576820b3c01392056437831352a063c827a70c03ac68ccafc9fe8 SHA512 e75cd55496d99633503fd1aa956da0c00b8b7e9b2e70e9f1abc71203840d8e68cb7c1299fae71fce67d2de41a86b41d3691f3faa9c9a8dd0eff66db758542033 MISC metadata.xml 511 BLAKE2B 9c3d4f7b671911fae37edbabefbb7f937ea42f321d41713e7f276df9ab31a655a9964eda0a33adb6b0cac13088315887b12806843f1509adb4cc37b5aa0256ef SHA512 3bae2859a69e91b51f09e1f6779007de7f0463220a39ac2915e0b8d86b825693de0b2544e6517cd836e9cf8aeb56720aa8d998ee85710b2801b189a679ddcd9a diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild index 04593c37fc4f..8a6fb4140dd1 100644 --- a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild +++ b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,4 +11,4 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86" diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index 2bdaad491bf4..94cb145f0b24 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -1,11 +1,9 @@ AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f +AUX ffmpeg4.patch 619 BLAKE2B 365911baabf0c5a0788e1a964aea75d04749bc6874a696104ed47f7d9c017cb31d0c11294481768ceb3f0c8c139256b0876d5266594cf780954533395ead7034 SHA512 3055895af8a651dc7cac24c4a7258adbd29586a1411178ca7eb7420b8a0897cb6fc9d89dd42a41221b12a79e34757d82071c2841d77ecfeeeb42d60b9a4e8210 +AUX ffmpeg5.patch 5512 BLAKE2B 8bdd4e447fb825cd0a5cd1b2d56503803fc6cda2c8cab568caa604d6f9acaaae3b998b61cacfb275ff8ddb9c484b4ac3d40409b0f56f878437a1332477b6be75 SHA512 bf927c2eec9a6cbc373355c5535bce63618fa29def46c1357172fd45e8229eb122e680e3f7ca01012cc4b9eb49d9c254e302ea42350d3c79a4d44b4ac802235c AUX qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d41611198381165e386d135d334c4f3cb2293592abca72bbb16307b2e5a17d5903d4899c7fa2cd1790d5a SHA512 9a1138acd9bd5ce75a709d50dd585a17ca7d913d4cf37283d8db68e79fd08bf98ddd27ea5d2e459efac0a71df1369c83a67f6727419c0d26c0dd02f5a6ce22b8 -DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970 -DIST gazebo-11.5.1.tar.bz2 56486174 BLAKE2B c1bffc5067f2739a8eb2e178bb2209d9c7b5a58d0589710cc515c4bcbbca281fb94ddf16de977f3771bc4b64fb6afe8e86327dde00d19ef62754e4d7634bb65f SHA512 7c922963881cf079e926c239f510e722fc6cabd07ef5e846a4b78772364a3aecb0b68f2b690ff451d42ceb11e88e2f831c30515e5a228f12826516ecad10e53a -DIST gazebo-11.7.0.tar.bz2 56394312 BLAKE2B 2da58a2702113c1954f0202bb779b723ad8e59cab678f9ca6fe64908785198b996ef71c845a1a85f00e2f4eddb9ed5683f815ada850917b2af4afad214eac77d SHA512 7de40908a021655b2a200a73cf979585f4bdb245064f7e9a853998f87df329223252c73882aa1e2b705bc7de5841e2a87d67f772dfef18e5735c1b06c2663192 +DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3 DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694 -EBUILD gazebo-11.3.0-r4.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac -EBUILD gazebo-11.5.1-r4.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac -EBUILD gazebo-11.7.0-r3.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac +EBUILD gazebo-11.10.1.ebuild 1970 BLAKE2B 36e71e0bf16f643a997d56d8a83235e33d336b70cd1951fe4b14c3a8ec80109f2ea61b25ddb3c1f2c368e1cda088c161d7bd5d968fc962523e935dd2f33ac57c SHA512 d889a779064d00ba0ad9e8070ee7946a4086be50689e95218ed2ed6037084218d011f3d49ea0e2ed6d7815c10fa48204b9e46b8afb8014107c70cafdf4337625 EBUILD gazebo-11.9.1-r1.ebuild 1912 BLAKE2B ab1806c0767335f5d3d51f9bf1832cb7e75c44c9ad47560153867167451019d1b296fce5a7c66cb4d1db7379b59970f3612f2b180ecb2a3a963b64e2389b152f SHA512 77e581310235fcba1f4e140d44b0525ba2fd5a29aa0810c9013937defe94cf75cb9a1560544f86a8c35db8de1bb01c29ed75931d6e2a46a387a7b756fdd58b56 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch new file mode 100644 index 000000000000..7b7c8d7270fd --- /dev/null +++ b/sci-electronics/gazebo/files/ffmpeg4.patch @@ -0,0 +1,16 @@ +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 new file mode 100644 index 000000000000..e55bab3c311f --- /dev/null +++ b/sci-electronics/gazebo/files/ffmpeg5.patch @@ -0,0 +1,137 @@ +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.3.0-r4.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild index 22a15762cc2c..3291c74fa777 100644 --- a/sci-electronics/gazebo/gazebo-11.3.0-r4.ebuild +++ b/sci-electronics/gazebo/gazebo-11.10.1.ebuild @@ -49,7 +49,7 @@ RDEPEND=" net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= - x11-libs/qwt:6=[qt5(+)] + <x11-libs/qwt-6.2.0:6=[qt5(+)] " DEPEND="${RDEPEND} dev-qt/qttest:5 @@ -65,6 +65,8 @@ CMAKE_BUILD_TYPE=RelWithDebInfo PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/cmake.patch" + "${FILESDIR}/ffmpeg5.patch" + "${FILESDIR}/ffmpeg4.patch" ) src_configure() { diff --git a/sci-electronics/gazebo/gazebo-11.5.1-r4.ebuild b/sci-electronics/gazebo/gazebo-11.5.1-r4.ebuild deleted file mode 100644 index 22a15762cc2c..000000000000 --- a/sci-electronics/gazebo/gazebo-11.5.1-r4.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-2021:= - >=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:=[threads(+)] - 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}/qwt.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.7.0-r3.ebuild b/sci-electronics/gazebo/gazebo-11.7.0-r3.ebuild deleted file mode 100644 index 22a15762cc2c..000000000000 --- a/sci-electronics/gazebo/gazebo-11.7.0-r3.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-2021:= - >=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:=[threads(+)] - 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}/qwt.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/geda/Manifest b/sci-electronics/geda/Manifest index 4ea1cf868f68..babb809eba58 100644 --- a/sci-electronics/geda/Manifest +++ b/sci-electronics/geda/Manifest @@ -1,5 +1,10 @@ +AUX geda-1.10.2-drop-xorn.patch 1958 BLAKE2B 874d2457d1589fd6a5f0eabea50b8ecda860a3e4b29df748077cb855f9da9d693ef2036497562430d9d70c3c6bb7a8746ca2b46da784d37bc5228531370a2971 SHA512 6deacf5624fde0dcb9ed0059e63a23b44cffeb35975e8a2d3872a6cdb878625207e4c168f9a88a7fca848f23be1b128f2377701b57d651e9b05cd264ece76ca7 +AUX geda-1.10.2-fix-gtk-sheet.patch 431 BLAKE2B 47a72f0b16a90398c03f0c37fbdbd357a612d4896c2274e498606b5a69ea970598687965416e6ab62d5d2187851aeebd0bf96d530ab4094ac33e9080fa90bf3e SHA512 7b21ab5a23589b6fc4bbcea851f6f1c1c64cb02ee0a914e6533721d057e06f491a6c9787f1408974845672b526027ef47361e8b20c7cb3df050d18912e121a47 AUX geda-1.9.2-fno-common.patch 2724 BLAKE2B afc18d971ea58df785025e9cdce22df967385e6f143320a3e48895bb97f720691d245e1b7da953459fc3dccddbef492c34233bc25194ee1b377bd6abd8af773e SHA512 566f77d5acacd4e0ebf0b27eca91e2482320b22f73d5561457f69d7eeff6e54b4bbb672602be271b2243b268d78a8b18506d1f7607a367dd9dc8eb497cd1da2b AUX geda-1.9.2-guile-2.2.patch 655 BLAKE2B 503f041c3217dc6eaccba95fe5044a88ef08d9e625c50cfbfdeba29e3bef68e341b8920d15aebf9e921dfe875d45bd9bc0d57f1683fa8a46b519a0affb9c97d6 SHA512 f6dd973626fc2717c4262d715dcb3fcaafacd5773cfadaeade292b4f637ae19f30e4a0338e41037ba403b9133e9670d434d6ac7d67dd4eace69bca98a9d0ed1c +DIST geda-gaf-1.10.2.tar.gz 14441491 BLAKE2B d6ecc4bc1390ff457396ae406fdeee909418f63d8c50e537215fa0a1131cfda91339f44ddc2c91ca0f3772f4416be1c4448fea45336c78bb601fb9b4df399b14 SHA512 c7beabf019762d9d3b4faa63f1345fb064ebbb6e0203a6c5bcab6b740d20db9f3cedf85c2f99e3ab1cb5396c06886fad1dbd5201eb7bad9e77c03511cf23b1a1 DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3 +EBUILD geda-1.10.2-r1.ebuild 2228 BLAKE2B b29c878b05ffe7879b7107d546071044d7dbb790d7e1a18b9afe1d255babd4235f9df75eb47cbb3566c134f30fc2466c7e6e4cd54b0ec45223e39acf415f4b4d SHA512 361ab53aeb6bd90b6430cdff30ce308ef97a734d6a968b330f9a07085c4640729eb626a50a411a06f81123d50973d512a02e50bbb89bc46ca5ba05c4441f4755 +EBUILD geda-1.10.2-r2.ebuild 2278 BLAKE2B 5c46a6f5dee7ec8fb0aa66f0faef04aee88c9a4fe263a63af035aec2d25e2d90eb08ebcffbb0cfa7524fe1c096f6a204d8abe8016e800faaffa9ba71694b0142 SHA512 f4f1db56808bfcba4db18810e8e323d49f47296c1fd443c95c50ae8e9567c22319477aa87a11bb01b8b2277630c3766398837dc9da9cb34579ab6a1b12dd176e EBUILD geda-1.9.2-r1.ebuild 2031 BLAKE2B 209413b23a328e3924aee86909adb88ae59cf0b4c2462d9f9f1e000c6718b5742da39a54b75aae7f8aca6c72448577fbfd94d443559927da972967f5dce5b025 SHA512 f6267b9a7ef7a995de3e83abcd2b1f72a2de51d194d29eb9a8cae3291921ce2ea3e5588b9edf5c89d33dbd70d7d57090b3aa1ff0c83540b94a2f1df608ac7ed8 MISC metadata.xml 1108 BLAKE2B 4a11952f3543eac02bd65619442e3dd333c550c93969e5c8032d8f478b19a37763f23d353b9f7bd6b61783c70c5eafce10e493e5fd3a594edcdf93dba926d766 SHA512 9f4527cce78e7e5a69c7cd3f655be7f51f23eed736e94f63ec84dfe19ed7b409512e357f4008a2271f42f4d96c6b86a5aeb244efd6ce10d6a3bbeeb8f65be2d2 diff --git a/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch b/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch new file mode 100644 index 000000000000..f1532677bd53 --- /dev/null +++ b/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch @@ -0,0 +1,60 @@ +diff --git a/Makefile.am b/Makefile.am +index 161083c..d54eded 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,7 @@ if ENABLE_GATTRIB + GATTRIB_DIR=gattrib + endif + SUBDIRS = libgeda libgedacairo gaf gschem ${GATTRIB_DIR} \ +- gsymcheck gnetlist-legacy utils symbols docs examples contrib xorn ++ gsymcheck gnetlist-legacy utils symbols docs examples contrib + + ACLOCAL_AMFLAGS = -I m4 + +diff --git a/Makefile.in b/Makefile.in +index 31778d8..59789e6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -180,7 +180,7 @@ ETAGS = etags + CTAGS = ctags + CSCOPE = cscope + DIST_SUBDIRS = libgeda libgedacairo gaf gschem gattrib gsymcheck \ +- gnetlist-legacy utils symbols docs examples contrib xorn ++ gnetlist-legacy utils symbols docs examples contrib + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-tools/ar-lib \ + $(top_srcdir)/build-tools/compile \ +@@ -454,7 +454,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + @ENABLE_GATTRIB_TRUE@GATTRIB_DIR = gattrib + SUBDIRS = libgeda libgedacairo gaf gschem ${GATTRIB_DIR} \ +- gsymcheck gnetlist-legacy utils symbols docs examples contrib xorn ++ gsymcheck gnetlist-legacy utils symbols docs examples contrib + + ACLOCAL_AMFLAGS = -I m4 + +diff --git a/autogen.sh b/autogen.sh +index 7b82f04..4d81174 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -225,4 +225,4 @@ fi + run_tool "$AUTOHEADER" && + run_tool "$AUTOMAKE" -Wall --copy --add-missing --gnu && + run_tool "$AUTOCONF" && +- (cd xorn && autoreconf -if)) ++ ) + + ##################################################################### +diff --git a/configure.ac b/configure.ac +index 1f19064..257ee20 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -197,8 +197,6 @@ AX_LIBGEDACAIRO([1:3:0]) + export GEDADATADIR + export GEDARCDIR + +-AC_CONFIG_SUBDIRS([xorn]) +- + ##################################################################### + # Generate output + ##################################################################### diff --git a/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch b/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch new file mode 100644 index 000000000000..d351b84b390f --- /dev/null +++ b/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/834834 +From: Maciej S. Szmigiero <mail@maciej.szmigiero.name> +--- a/gattrib/src/gtksheet_2_2.c ++++ b/gattrib/src/gtksheet_2_2.c +@@ -8102,7 +8102,9 @@ + return; + } + +- gtk_sheet_get_cell_area(sheet, row, col, &area); ++ if (!gtk_sheet_get_cell_area(sheet, row, col, &area)) ++ return; ++ + child = gtk_sheet_put(sheet, widget, area.x, area.y); + child->attached_to_cell = TRUE; + child->row = row; diff --git a/sci-electronics/geda/geda-1.10.2-r1.ebuild b/sci-electronics/geda/geda-1.10.2-r1.ebuild new file mode 100644 index 000000000000..314a941f9a7f --- /dev/null +++ b/sci-electronics/geda/geda-1.10.2-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + media-gfx/imagemagick + virtual/latex-base +" +inherit autotools docs xdg + +MY_PN=${PN}-gaf +MY_P=${MY_PN}-${PV} + +DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package" +HOMEPAGE="http://wiki.geda-project.org/geda:gaf" +SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug examples fam nls" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-libs/glib:2 + dev-scheme/guile + sci-electronics/electronics-menu + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango + nls? ( virtual/libintl ) + fam? ( app-admin/gamin ) +" + +DEPEND="${RDEPEND} + dev-util/desktop-file-utils + x11-misc/shared-mime-info" +BDEPEND=" + sys-apps/groff + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +# Xorn requires python2 +PATCHES=( + "${FILESDIR}/${P}-drop-xorn.patch" +) + +src_prepare() { + default + rm -r xorn || die + + if ! use doc ; then + sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die + fi + if ! use examples ; then + sed -i -e 's/\texamples$//' Makefile.in || die + fi + + # add missing GIO_LIB Bug #684870 + sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \ + gsymcheck/src/Makefile.am || die + + sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \ + gnetlist-legacy/src/Makefile.am || die + + sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \ + utils/gschlas/Makefile.am || die + + sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \ + contrib/sarlacc_schem/Makefile.am || die + + # remove compressed files, compressed by portage in install phase + rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die + rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die + rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die + + eautoreconf +} + +src_configure() { + local myconf=( + --disable-rpath + --disable-update-xdg-database + $(use_enable doc doxygen) + $(use_enable debug assert) + $(use_enable nls) + $(use_with fam libfam) + ) + + econf "${myconf[@]}" +} diff --git a/sci-electronics/geda/geda-1.10.2-r2.ebuild b/sci-electronics/geda/geda-1.10.2-r2.ebuild new file mode 100644 index 000000000000..a1e9c74fae8e --- /dev/null +++ b/sci-electronics/geda/geda-1.10.2-r2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + media-gfx/imagemagick + virtual/latex-base +" +inherit autotools docs xdg + +MY_PN=${PN}-gaf +MY_P=${MY_PN}-${PV} + +DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package" +HOMEPAGE="http://wiki.geda-project.org/geda:gaf" +SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug examples fam nls" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-libs/glib:2 + dev-scheme/guile + sci-electronics/electronics-menu + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango + nls? ( virtual/libintl ) + fam? ( app-admin/gamin ) +" + +DEPEND="${RDEPEND} + dev-util/desktop-file-utils + x11-misc/shared-mime-info" +BDEPEND=" + sys-apps/groff + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + # Xorn requires python2 + "${FILESDIR}/${P}-drop-xorn.patch" + + "${FILESDIR}/${PN}-1.10.2-fix-gtk-sheet.patch" +) + +src_prepare() { + default + rm -r xorn || die + + if ! use doc ; then + sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die + fi + if ! use examples ; then + sed -i -e 's/\texamples$//' Makefile.in || die + fi + + # add missing GIO_LIB Bug #684870 + sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \ + gsymcheck/src/Makefile.am || die + + sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \ + gnetlist-legacy/src/Makefile.am || die + + sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \ + utils/gschlas/Makefile.am || die + + sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \ + contrib/sarlacc_schem/Makefile.am || die + + # remove compressed files, compressed by portage in install phase + rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die + rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die + rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die + + eautoreconf +} + +src_configure() { + local myconf=( + --disable-rpath + --disable-update-xdg-database + $(use_enable doc doxygen) + $(use_enable debug assert) + $(use_enable nls) + $(use_with fam libfam) + ) + + econf "${myconf[@]}" +} diff --git a/sci-electronics/gerbv/Manifest b/sci-electronics/gerbv/Manifest index 8fd873db6e04..4606fefd1afe 100644 --- a/sci-electronics/gerbv/Manifest +++ b/sci-electronics/gerbv/Manifest @@ -1,4 +1,4 @@ AUX gerbv-2.7.0-fno-common-gcc10.patch 526 BLAKE2B cceab2910ada8bde66987e403bdf765e98b62bda66cbd46ee50705c6be539e971eb7e0420b261b97ef3dbb6e0280fb351e425f2b4391bc1cd3af91ee0ba1251f SHA512 fba1f40ac844268f2d81ee63c04509a64cd9b016c0fe3dd8736c3a4faa3727e5ac9a9f6c0bba5a8d4f5362e701a33c1dbc93409dec630896ad06c80dcc5f13a3 DIST gerbv-2.7.0.tar.gz 5691407 BLAKE2B 458440dd69f20fee18ce09953c7403d783b2b7df1bf977e192b1ac877ebd9ed535ef7712417e112cff82d95e1c3752ae1dd4d88dfe14dea45df7c959337cb6ff SHA512 a940de027a9cdfdc513b0740cb402d312ae33bb7f002f80ee5f3e800aa5d01b86ff277538d8a19a309d852e248b2c8136645ede2d5d33456e5bfb49336c1256e -EBUILD gerbv-2.7.0.ebuild 1043 BLAKE2B c45330111e1989ab50b8dfe903e917b9db13e3b944bf6263221c939e7c94207ed32711c9ef3087374aa64e3b81e5bd516f002bbdedb06c95e7293cbc3823666c SHA512 c3abe4b3018e9b857b6cbaf3654e090ed29fe1738957af83aedbdb760f3cd1d4165d36356f3fc76c4778d26940d63843b6f41d25ea8bdb86b214720f07796d1c +EBUILD gerbv-2.7.0.ebuild 1033 BLAKE2B 2bb185d77f4c3b5318d0e5161891d7fd96aeba294ac2f288ab9cbf0173965823c9c4fd3f4b698611a68166f1254d0a334b46dbe61a84c37ac23fc4a5a98ae2e5 SHA512 6b671948013de422e391e07172ba25c9bcc64822bbd968ba628bab1dc3c89f2662a7ec87c22a82cf757218b02aca63e4ca487607fd8602e4f6ba716c7611111e MISC metadata.xml 803 BLAKE2B d9038af386a91a0890d45fd7f90e9bfa7ef0caa85cbb6d97c3686ad1fb3adced642114e17e8cbc645e462d15ff8694470e16edbcb794f8b2c583655be9462de2 SHA512 d26fbc758c4af9938c552ca131d04e20433ba8de527d306bfdde5e6a5b552fb20bff8c5223227fd1605e7f5940b713365041adfcc6754e1fa3cbab0070223f1a diff --git a/sci-electronics/gerbv/gerbv-2.7.0.ebuild b/sci-electronics/gerbv/gerbv-2.7.0.ebuild index 82242e80810c..48219cd522a6 100644 --- a/sci-electronics/gerbv/gerbv-2.7.0.ebuild +++ b/sci-electronics/gerbv/gerbv-2.7.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools xdg +inherit xdg DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer" HOMEPAGE="http://gerbv.geda-project.org/" diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest index fcc690eb03e9..e9ae3d3717c8 100644 --- a/sci-electronics/gspiceui/Manifest +++ b/sci-electronics/gspiceui/Manifest @@ -1,4 +1,7 @@ AUX gspiceui-1.1.0-flags.patch 1017 BLAKE2B c240c7d48a50b508b1f4426ab636909856946ce1159c535f0d682994b929faea2be254a39d4ce8f7bedcdc92ff39a8e7af2e29bba11dc8a95e6e71177c47e5e5 SHA512 bdca1e2bbbabf15f02002aab284cf44368e5bb86f9a479ea1194522c5a3e2fa02950795f0dcbc69dd943ec5ade34f134913d643ad13aac6eeb3330e1502e8ab4 +AUX gspiceui-1.2.87-respect-users-flags.patch 2257 BLAKE2B 54d18a89166b45fc121fc6f62cb346ef7cb8a6ae7ff5b5835a10aa2de4134ccb872c2cfc988a45636d54622912af9a1b9762b6964f2daf3730592b982cdff9a5 SHA512 a03dd8f0f150fca14f8fe26155920fc3da535c8313b12b5ff8746cc61a1fed765f86ce012e9e6639eb77b1a854acc76c4b0f80fe224cefbd9e3df97c72143412 DIST gspiceui-v1.1.00.tar.gz 1048236 BLAKE2B cc3d14137517cd26687dabac7e001e7518fee91aedc74f1995ac763873345f2965c3edb4e037ecb6ac8ca874289b2e658fe3185d95b3eeaf2b349efab151f37b SHA512 46ccf3dd7a5dd9ec1cac1eb742187ecab15a6c0033467d52a44c916e239696faf7b8797e1a155191cf0ed37b04619b0666cff51e78912a06ecd2c63d377cba93 +DIST gspiceui-v1.2.87.tar.gz 1089733 BLAKE2B c1801bfebd5d42fe9c1ab26e6fd0cb06b56cac53bbad272522896325e5fd979e6fcc63d6f99262b152180f249b5b2d4aa119aa83254a2fc07256574c9ebaef10 SHA512 081d04c39f4fb96139f12fa063dfb888e036948a00a6b55de3b04a49b2b4af01b45fd9b7f903855d798a71957452550dfa8c8505c167c239e27ada29cb6fa747 EBUILD gspiceui-1.1.0.ebuild 1892 BLAKE2B 21d35e599d7187a7580cd96fc9fdeb00edb48dc8a0eaffdf4230f1a309e3dde514f78391c6926917e95126d320c7dadcf00f905373c0a495b0e1208d9c6e08d2 SHA512 523ca58e4db3a28529f7820c1322cfe27b88457412374b8c57502a9182f23004e3ffd659545958a67f9734261f30e0b3a740545098923478ce227263bab1a044 +EBUILD gspiceui-1.2.87.ebuild 1838 BLAKE2B 1c933f1a2502d50b23a07531ec035d1fc36a161868184f8956c4e243da280a5fbe20dff10da89770d480f377aff52a536b5f57c590474115526d7795226be749 SHA512 09ed1215672d1926b7ede1990ed7746cf9c7752be3c8168481f0943d5c5d1f636f724d242fa54d7b6e84b4dc27260c8d277ae032c61283591f12a8ae190acd8f MISC metadata.xml 560 BLAKE2B 7bf55c85b52ee2e7b7627cddf9fed3aef875057b32348cc770ae4f1765e415f24184769ddf4c308b107f2d3d87a53f0bec0aa0e7b67932536a669a6e1e447f0d SHA512 6700697e40e911690b27fdf068d3cb15c0b03c59e8af0258459109d27a6e709911f60fd555d59ce8b02143f36d1d462e1e6f336a8573e45537c6a6a6c3d4b67d diff --git a/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch b/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch new file mode 100644 index 000000000000..c39b6a329aba --- /dev/null +++ b/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch @@ -0,0 +1,56 @@ +diff --git a/src/Makefile b/src/Makefile +index 50736fd..8dbfcfa 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -39,8 +39,8 @@ DESTDIR = /usr/local/bin + #*************************************************************************************************** + + # Which compiler and linker (eg. g++ or clang++) +-CXX = g++ +-LD = g++ ++CXX ?= g++ ++LD ?= g++ + ifneq ($(GSPICEUI_MSWIN),0) + LD += -static-libstdc++ -static-libgcc + WINDRES = windres +@@ -91,13 +91,7 @@ BINDIR = $(ROOT)/bin + # -Os Optimize for size + # -Og Optimize debugging experience but don't break debugging + # -std=[C++NO] The C++ standard to use where C++NO is eg. c++98, c++03, c++11, c++14, c++17, etc. +-ifeq ($(GSPICEUI_DEBUG),0) +- # Options for release (not using -Wall since it's GCC specific) +- CXXFLAGS := -O3 -std=c++17 -pipe $(shell $(WXCFG) --cxxflags) +-else +- # Options for development +- CXXFLAGS := -g -Og -std=c++17 -Wall -Wextra -Wpedantic -pipe $(shell $(WXCFG) --cxxflags) +-endif ++CXXFLAGS += $(shell $(WXCFG) --cxxflags) + + # I like to compile using the option "-Wall" etc., tests that break wxWidgets are turned off below + ifeq ($(GSPICEUI_DEBUG),1) +@@ -117,6 +111,7 @@ INCLUDES = -I. + + # Libraries + LIBS := $(shell $(WXCFG) --libs core,base,html) ++LIBS += -lm -lstdc++ + # (The pkg-config stuff was requested by a user, somehow pangox was missing) 2019-08-07 ??? + #ifeq ($(GSPICEUI_MSWIN),0) + #LIBS := $(shell $(WXCFG) --libs core,base,html) # $(shell pkg-config --libs-only-l pangox) +@@ -181,7 +176,7 @@ $(OBJDIR)/%.o : %.cpp + # -o specify the output file name + + $(BINDIR)/$(PROG) : $(OBJS) +- $(LD) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS) ++ $(CXX) -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS) + ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app)) + cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui + endif +@@ -223,7 +218,7 @@ tests : test_Component test_NetList test_CnvtType test_CmdNgSpiceOPT test_CmdNgS + + # Compiler options + +-test_% : CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags) ++test_% : CXXFLAGS += $(shell $(WXCFG) --cxxflags) + ifeq ($(GSPICEUI_WXLIB),2.8) # This suppresses spurious warnings from gcc with wxWidgets v2.8.12 + test_% : CXXFLAGS += -Wno-unused-local-typedefs + endif diff --git a/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild b/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild new file mode 100644 index 000000000000..d5377a288285 --- /dev/null +++ b/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +inherit desktop optfeature wxwidgets xdg + +MY_P="${PN}-v${PV}" + +DESCRIPTION="GUI frontend for Ngspice and Gnucap" +HOMEPAGE="https://sourceforge.net/projects/gspiceui/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +DEPEND=" + x11-libs/wxGTK:${WX_GTK_VER}[X] + sci-electronics/electronics-menu +" +RDEPEND=" + ${DEPEND} + || ( + sci-electronics/ngspice + sci-electronics/gnucap + ) +" + +PATCHES=( + # Use Gentoo LDFLAGS and CXXFLAGS + "${FILESDIR}"/${P}-respect-users-flags.patch +) + +src_prepare() { + default + + # Adjusting the doc path at src/main/FrmHtmlVwr.cpp + sed -i -e \ + "s:/share/gspiceui/html/User-Manual.html:/share/doc/${PF}/html/User-Manual.html:g" \ + src/main/FrmHtmlVwr.cpp || die +} + +src_configure() { + setup-wxwidgets + default +} + +src_compile() { + emake +} + +src_install() { + dobin bin/gspiceui + + einstalldocs + dodoc html/*.html html/*.jpg html/*.png + dodoc ChangeLog ReadMe ToDo release-notes-v${PV}.txt + doman gspiceui.1 + + # installing examples and according model and symbol files + use examples && dodoc -r lib sch + + newicon -s 32 src/icons/gspiceui-32x32.xpm gspiceui.xpm + newicon -s 48 src/icons/gspiceui-48x48.xpm gspiceui.xpm + make_desktop_entry gspiceui "GNU Spice GUI" gspiceui "Electronics" +} + +pkg_postinst() { + xdg_pkg_postinst + if use examples ; then + elog "If you want to use the examples, copy and extract from" + elog "${EROOT}/usr/share/doc/${PF} the sch and lib directory" + elog "side by side to your home directory to be able" + elog "to generate the netlists as normal user." + fi + optfeature "schematics editing" sci-electronics/geda + optfeature "waveform display" sci-electronics/gwave +} diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest index 9621b19c2a8d..4e6156188973 100644 --- a/sci-electronics/kicad-footprints/Manifest +++ b/sci-electronics/kicad-footprints/Manifest @@ -1,6 +1,6 @@ DIST kicad-footprints-5.1.12.tar.bz2 3382783 BLAKE2B 6f7725bebd6099d86780ed2582aacfb3abff4db6065a6a17fcd7631782a0c2e1e8a23064f80cd95c79bbaca8da52003f01fce7e398e95596e45f15b144eeef7f SHA512 e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9 -DIST kicad-footprints-6.0.1.tar.gz 31372634 BLAKE2B 5cb451a9a69c926af1aa8e0b180a244b8e195a450c83c960d62125d3bfc35d6a8c0a07e1a54c207fe851198b83bbdc7e3a26d06bdd92afbb1637733898661159 SHA512 dbe8689a0f32a9b448c7aa37c673736d97163f8e3f23b1e5119a732926cfd635aaa7927f0bf77327ab824353fe431523ca10f4035a37ca4fa364c8a7e2e2805d +DIST kicad-footprints-6.0.2.tar.gz 31568599 BLAKE2B 7c4c565f08700507ae3123cdd3990c33b7cb3e0a42a91da97d3ec58a921d934ad3878fde7c3d32a5d7b7ac9bd7ce5a2f89ababfda43ca8c9ae1bc2bfe54cd629 SHA512 8adba54026fafbddbe06512150917f3f3dc4a84d381e5e26cbf507fc597cd0bd40bc1618f2236d588024d164a129b30d587115cea3606542a5d230bcf48162a2 EBUILD kicad-footprints-5.1.12.ebuild 435 BLAKE2B f8452914dfffb5c899cbf8e0112318f96f3833628f90ca48c208c26b6a558ce69eb1e90f390f686c88b51ecc194abcf1bbc87aaa1457ded6980af0b0e49ee5c4 SHA512 9945e466d7812e9c44f4481a077cb19162a7d2ce73425a12b5e6bd51a1ae7cf7fa8d7f91cde116d55665cb49585e4936f8a2d141f1f8a612f49c0b8a1c8a736d -EBUILD kicad-footprints-6.0.1.ebuild 863 BLAKE2B e7abdc6cc61b2fda88acd5618a0263bc8991dae6042b02172e1a31b559714fbff03b9b15846c99079ee9ba03a05d27d537983727baf9ffea3c8aa128904d5ccb SHA512 5ee5c0fce8ae9a38b51ca01bf7d4cd49ffb92d7230aa31b05a9e4c48a91734ec24c85669feb6b1ac675b8a5fc55e8c89944722b8f223abd2815800de828f0cd3 +EBUILD kicad-footprints-6.0.2.ebuild 870 BLAKE2B 5ba8eda9374024ba6293409b98a89035b74ed2b2e5de5cce90045edac7cfdc54c8fd7669804a55796c53954e1d503a03ea94cfc1053cb76d440268cafc427a93 SHA512 561c2bb63e31558701f619373be2fcc8490ce0294300733014506b344934e5d7a5c7ff50bb6242860ec51d755569640cbe4f2328d6766e0559b7558ec10aaae6 EBUILD kicad-footprints-9999.ebuild 863 BLAKE2B e7abdc6cc61b2fda88acd5618a0263bc8991dae6042b02172e1a31b559714fbff03b9b15846c99079ee9ba03a05d27d537983727baf9ffea3c8aa128904d5ccb SHA512 5ee5c0fce8ae9a38b51ca01bf7d4cd49ffb92d7230aa31b05a9e4c48a91734ec24c85669feb6b1ac675b8a5fc55e8c89944722b8f223abd2815800de828f0cd3 MISC metadata.xml 766 BLAKE2B cba91a16d3b205f5f36dff3aba3afad956d98d23ac08ecb26bf3ef5471e5fdb7698c86cc1e245a34069f73a052eebdd37594941194b7f3f5d9c57a88718d7de0 SHA512 8d24ac5ad64aec5939be1244e417c2299353d6d618bea63ef949f6c82a865cee98ab11a3dd8c57e447e13203abc3a40da7070f585379c1ec54b0bd46c214d0ec diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.2.ebuild index 995b74bb1881..e1268b9afd0d 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.2.ebuild @@ -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 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest index 835d6bcded46..5ebec74c1b80 100644 --- a/sci-electronics/kicad-meta/Manifest +++ b/sci-electronics/kicad-meta/Manifest @@ -1,3 +1,3 @@ EBUILD kicad-meta-5.1.12.ebuild 620 BLAKE2B a4c802e020999a16be0b615bb2bb18d11330b041822a283f541f98d17b6d247c9ca835c5d177928fce26a638412c94de6fdf122f5eb3c5afdc8dd7365ff6a0f2 SHA512 aa7ff651a6cc3761f88b87462b91d3e125e69c8155a95676d77013a0a9824f454cc3fa276ea88e1ef2a2c7a5cccc89e0085b698354d145e3ce38a451018d50f0 -EBUILD kicad-meta-6.0.1.ebuild 610 BLAKE2B 5c94697d9d8acf3491e1c175645e517591247467519010145389ed95c90bfcbf7ac0fd603df68971f11d8f9fb9099c9e71186f14c83cfefabde0444653dee608 SHA512 1021e21ad102ab9b4807b6294ef8a506cf7017cb9621f575c144208f05944ba3b0f88e85f5a6a07656c3eadda439bb028105c61c814fdd37f15849d52df4b50d +EBUILD kicad-meta-6.0.2.ebuild 617 BLAKE2B 586b8fa96d7345fbc8976f0cac98c8357ac316d90f74433d4e48d759ae4613150e05f5caa5e0da83c4ca0f680edf8cf46370346bad694f941f5c12959effd9ce SHA512 0ccb2e1737e9b0b1589905e78818d7b5ccd7221ec329cb21c95902da32a59fa67400fb038edc05447d0632aaab0f6f3f265ba07b067f523ffa1f1ed16968e53d MISC metadata.xml 625 BLAKE2B b85af17cbbc843d7d841344c73f0812457bf6ef209c44397bfcf5404175dc20a2525fb4b9501ca61ab686c7afb365bc7165b632ec71b907bcfbe7e651df54e0d SHA512 fdf916963a769a8b0f0d0f3ecf737c3e19a928ac3335d042fe9f57b700a9738f1e834a1f42a97efd9171fd3d218ac9f33337b30583516654efb03bc6902869c6 diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.2.ebuild index 570479b87ece..9b332cea06f2 100644 --- a/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild +++ b/sci-electronics/kicad-meta/kicad-meta-6.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi IUSE="doc minimal" diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest index 5afe042d5243..22fb1c689990 100644 --- a/sci-electronics/kicad-packages3d/Manifest +++ b/sci-electronics/kicad-packages3d/Manifest @@ -1,6 +1,6 @@ DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2 -DIST kicad-packages3d-6.0.1.tar.gz 943455043 BLAKE2B 7d26b3f6eb9fe279343d9c43dfff875ba2f56b56ff1fe868a07fa43f9abe476f7b6c8e3e9122adf2bf5546b571f45573926055452bac9b5dc03618dd8ace245a SHA512 326ad5d3b4fea482921af2f69b21e7f36ad462632804c24c160b824e722d79050a2e7d81b499fad09c7e03381026a9d3d292a85ace79d7a7cc3a976454e8bb83 -EBUILD kicad-packages3d-5.1.12.ebuild 602 BLAKE2B 62514efac88725f127605ddac5ddfed4abbb7e5972b6bf818785caacdcb6cb201b969fe55894ac74f2e67af4342c81482bff1892476528b7694460a2bdcce88d SHA512 9ee93e24de865787430eae1c7e4d1dbe50061f389929011b143abc627a398e8ed8f1ccfa097c8005ec969fb1a8b8e2914a0b17b5f31130c16231bd9e5d019c3c -EBUILD kicad-packages3d-6.0.1.ebuild 948 BLAKE2B 3f971388bf7c023551a22595fcf990574b57646a71906baa8ebd4afec2d05bcb121b90dd1444229f365d2d3d9b90ddd748e94f36a7e6c40db95706d8a038dc5f SHA512 33eb6a6eefbb62abe85d3dd9c2932575a72cf038581ec936c2c8b6fbf74a3dda3b21792c1a812ddee0bacbd9898906c2e8e028e88545bb90047b52916f33097d +DIST kicad-packages3d-6.0.2.tar.gz 946918858 BLAKE2B 36fbb4e7acd4dba9644a700c2161d4c4bdb74b34e1ff53f458e003d69af6af2df1b2e48175cab0b3a0c1b6c7cb70c3d7b6f34f2d269b35901dd73763badb8f7f SHA512 10ca7da72f0da13affa1590c8f216aed7607a3fecc1073d4c3e14d986423563962835d4a097fb60367436dc70ffe9b30fcc513899d9f591761a935aa2af568cf +EBUILD kicad-packages3d-5.1.12-r1.ebuild 559 BLAKE2B 698bb6c1eeb4f63d69f29095bd17b00d5b420c1dd16faec9910e2b5a13e8be124d9c087dc1678ca3d516d1a8f143e8b15e68244d150955f37f23a5d7b1f8a617 SHA512 0475814185604358e047f864a847b273cbe032cbb0a5997f49a3afdc77c66c7fdb15b762b6f5337016f737f857b036bd37b64d5315858fc082dc87156871b691 +EBUILD kicad-packages3d-6.0.2.ebuild 955 BLAKE2B 5954ff1978a413cb04f7b2b636c16455476eb387992254f6c36a4c392e7c89959c62dfe77abf23f755b5f13f3cb06775412af48fb8ee9034a2d3c4a7c6169118 SHA512 697472033d5a005aacd6d19db676445cb519b9cbd167d5cf18853b07cd0b9d6258bcf0e6718b18ec59237d843147aa00d44da72443a0e7b63ae01453d0439cb9 EBUILD kicad-packages3d-9999.ebuild 933 BLAKE2B 7c56da88187d74ceb63e88691e124a9083e61e7703650d63689e256eb4c7b456cf48dac4f958d92a2ff8128d930ee1c1b4dda22e9fcf5cfba3d78212c05fda12 SHA512 038c920d7cf33eaf085ab5b0859c7ff8c4b6e0306b09ec65c09e0e1d4502a8a055f32056be171092f68245828be1f61e640fd386449e93b42b82669e7d867613 -MISC metadata.xml 976 BLAKE2B 70851f4db73dbf597cb669018fe27e4e1507cf4e86fa82488751a27fbdb8e85eb13d81ec42d62685c459a8c56cb1899579430132bc9ae4c0c0c2fdcb756bae1b SHA512 1e6512afe9ff98ee23c33bb339e1b6ad4b9da8d2bdf6ea52f40874ab77e4918aa565a550c384ecdc693a2f7b366cd07d4c5abae52dfc6177cf9262ad1a01d7b4 +MISC metadata.xml 897 BLAKE2B c306e73c992f4b4c6099176ed71b232aa196ff07c0ea2833b14d465a96f8db4623a17d629c66533d7a8dd5032dee74aaaf7ebacd3ed7c72359ad7b9b9746e348 SHA512 796a2eb49ff7d7f65d473217b2534a4ef811354828defb76005f694f37f7b638bb65be304de74507e89b99c0e97026503e74222fa972c389d638d2ef3ea059b1 diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild index 594ef53b2fc0..d37150d3243e 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,11 +12,9 @@ SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kic LICENSE="CC-BY-SA-4.0" SLOT="0" KEYWORDS="~amd64 ~arm64" -IUSE="occ +oce" +IUSE="+occ" -REQUIRED_USE="|| ( occ oce )" - -RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce(-)=]" +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.1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.2.ebuild index 5bf36a30f654..6375a1fe945c 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.2.ebuild @@ -17,10 +17,10 @@ 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 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi - S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-530926da52f5226de6fc3167cf2e0671fb7f0cec" + S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-02c0df0309784b30de2d65ca2c7385942591135c" fi IUSE="+occ" diff --git a/sci-electronics/kicad-packages3d/metadata.xml b/sci-electronics/kicad-packages3d/metadata.xml index 8395544a695c..c3ec4ca93a12 100644 --- a/sci-electronics/kicad-packages3d/metadata.xml +++ b/sci-electronics/kicad-packages3d/metadata.xml @@ -19,9 +19,6 @@ <flag name="occ"> Use <pkg>sci-libs/opencascade</pkg> for data exchange </flag> - <flag name="oce"> - Use <pkg>sci-libs/oce</pkg> for data exchange - </flag> </use> <upstream> <remote-id type="github">kicad/kicad-packages3d</remote-id> diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest index 45d5c8d0a4c9..937eb1985d1d 100644 --- a/sci-electronics/kicad-symbols/Manifest +++ b/sci-electronics/kicad-symbols/Manifest @@ -1,6 +1,6 @@ DIST kicad-symbols-5.1.12.tar.bz2 1815145 BLAKE2B e3a74c0e2cb24f4286cdd7fa63b62c72c39575475305680ba8e19d5b3acb5c6cbff1e17d37d169043949ad89ffb9b94f0341e1faf7d063c1cf9872d31b863e21 SHA512 32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6 -DIST kicad-symbols-6.0.1.tar.gz 4809762 BLAKE2B 8133932edf7f480ea61c98838e0c7b0ed32c79ef8cc89d385192c7cd137bcfabdb9a4ed28cc10b2006dfc37729b070d286a5b29b94108da487c797fef1605b20 SHA512 0f62118118adff693bb127d229232cfeeb88f48d3d818d44c3d9d8d1db89de903587ed8cc9081914eec8233650dd0bac6dd5d4618b4417bdf06955ebd1b8923c +DIST kicad-symbols-6.0.2.tar.gz 4816836 BLAKE2B be6a3c6166e11f939cacdb582fcf19bef553ad0046a407bab580de33442c6200e62c956d90587a1dbb5afcafa8e02c1e1188036be91a3cf10835bc39cf311d27 SHA512 72fb1016fe2c30f6f6c6efd9a639fb307f713c8652395df69eb1b12a7cdd1c691f4236772b23bbbccf458a765cb8400148ddf635dc0add14edeeb72e56c6b75c EBUILD kicad-symbols-5.1.12.ebuild 429 BLAKE2B f05364cdfb4fc1e8e6a79722c374d2f260ab46c6e35c09d209e1121cb6f188177073c2ef05283dae3700f8c3c6767216666f9460044e6c9b1525766b0898b98f SHA512 7cf1cff346c6ce05516825d89d08c25a7af0903464e92cd0003fe212bb58fb870c26692dbcc932ef1a552729e6927ed08e291ff0a022dcd4403ddb632f02ccee -EBUILD kicad-symbols-6.0.1.ebuild 854 BLAKE2B 0e054975aeef6ce0ed7c96e29835dc55c71a0b5662e164e418a91cc5f34529084ef719d784ae55a84b3c129da0650f05faf7f74e2ba013675302522c31293c2b SHA512 b6fc6e9883226a3567e58bbfdb8d40a9e7749e6bd16b0228b0f5f2a8ec4569fac8be526461f9ebf0edbf36470fdeafaa96c3b32473b93b1091da50a9b4053362 +EBUILD kicad-symbols-6.0.2.ebuild 762 BLAKE2B fd144c2c48d52163f6fff0528bb0e5becab560e9405ec4f37d19a9b355c6e46f288d2eeed8dcf226083aac028862bc5275a91ec5491518e13bc5ecf752aeecda SHA512 07d48e69e2dbc8e5a3987bfcd3f4887fa134ed8c886b2635aff46d3bf542229365be05f8cb5f9ece27d3aedd03d6ec688b08dfaa8dc33b689bc50ed653e844de EBUILD kicad-symbols-9999.ebuild 844 BLAKE2B 0105cb6e28b9f3b7426ddc4ffbacff06646d1c84d66a89d9dfc328511dd7c7339799ebadd24527e1120e6c4588fb7ff2b898749d19747088b3b722de36bd4a94 SHA512 90345c12a573d46121238ecb54678f86b5ce93cc1f80d66b137a9f220ed4865b550ceda56bf6b6eaca36e9b0fb8750fdb53c4837e02ef09a17f17e55ea1d4e72 MISC metadata.xml 724 BLAKE2B 10eccd33b4ca07e25e2b3ce44d30583671b33836f7fb7a9c68b063bb267529fb0e2988b71bc57d0d92967f583ae3ac4e0cdf0762da687a834f51620f45df5411 SHA512 76569f2955cf1db93bbac820d513aa4d58f4bf27089736a9adc98e1df4d21c0c80be6c894dc2eb024b2cb0271e37a479b15ce68d377bd028df2becf5166958a2 diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.2.ebuild index 911199e91fac..02943f2ff696 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.2.ebuild @@ -12,15 +12,11 @@ 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.gz" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi - - S="${WORKDIR}/${PN}-${MY_PV}" fi LICENSE="CC-BY-SA-4.0" diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest index d97c0cb64c20..74794ee7309c 100644 --- a/sci-electronics/kicad-templates/Manifest +++ b/sci-electronics/kicad-templates/Manifest @@ -1,6 +1,6 @@ DIST kicad-templates-5.1.12.tar.bz2 1552173 BLAKE2B 51791729e049aa835f15b80f783d07c099dd177783b1a78209e7c7db709a3b0a18bd22572227ab5193d4da955796bc4c78f502fdedd275f379f84fa49108a324 SHA512 4f44816fa78048c0db93ecd10ae980236bc5ef1ed5170270ac761dd5fc32d08a5c8bf733837e6dceecf736f75fa09780326af813de04cbd69345cf376815d430 -DIST kicad-templates-6.0.1.tar.gz 2248692 BLAKE2B fa9f1667958f25f965e1f41b50b009724b8b46960b55561048aca74f876196ac896ee72294f32ad815f7d7097dd4caba2a4fe8c5f6731e0e13322c48cf6df1a0 SHA512 ee0423949e63a17634c0abe3eb5184d16650cf702f37fa2f10af8f0e9377d4031b0b213cb8570af63d8ff8d5549f0b6f153287db9d8f64140273134ee2650a60 +DIST kicad-templates-6.0.2.tar.gz 2248737 BLAKE2B 1d460261fa3c0f2788feae211ae884faebba811956edbda4bc26596a53dd0a6587100c777352228c88db055e3182c344c0e1eee61f635631994a44af1f4c42ee SHA512 28b7f54235d1ee7f21a67f99fd848b76b53b94ff9351f43a68f0b920f76662cd29882ead6f9b40406f19768754f95d3ae3d883fffbf4bf99138be11bad6ba67e EBUILD kicad-templates-5.1.12.ebuild 438 BLAKE2B 245672d11e479bd59d83eae963c7606addb45d8202a7212034dc9d92f8eb27b2809844848722dccc2777dd4126e67b48049934a1077774f598a8ed9e1c1fc638 SHA512 e9e21e3a0b429a9f1d267f6d0f9dde8405ababdfb5cd81c8e3d8f6f7e1f136490c88238fbc699b296631cc75359f8c2205bd0f10f160cd15fcd1dcdce777c122 -EBUILD kicad-templates-6.0.1.ebuild 691 BLAKE2B 44322a26e224d77803cc24cb73723e52c8abf5c0887b7c30504c5b9530ff2e38d134fece90cba308ea4c4105759ef1ac06fb5a212409f06f73ec938bf4ed74b3 SHA512 395279ec620a31c789dae437e192b13347a32dbb8b637a5c2aa8e9615842d9f51ba0ccc5426cc2c65bc23dae09984c9a4e4bdcae3ba9ba588f6729c3e20be5ed +EBUILD kicad-templates-6.0.2.ebuild 698 BLAKE2B fcfe2e16a5b2864d82ec552ffdb3dc3600fe618575c1af65ebd2ee1db71e9d55081abd85c22648692dc1523ebefae42618bf35e1645644d48472111e1c0d05d7 SHA512 d6cbe3de9d0efe622e84d779652826169a2ad4f75e6f3855df57aba9947be776d0b856e6e4e759423345437bda0c8e4e1e48c7789e19e078f82305be00be66fd EBUILD kicad-templates-9999.ebuild 691 BLAKE2B 44322a26e224d77803cc24cb73723e52c8abf5c0887b7c30504c5b9530ff2e38d134fece90cba308ea4c4105759ef1ac06fb5a212409f06f73ec938bf4ed74b3 SHA512 395279ec620a31c789dae437e192b13347a32dbb8b637a5c2aa8e9615842d9f51ba0ccc5426cc2c65bc23dae09984c9a4e4bdcae3ba9ba588f6729c3e20be5ed MISC metadata.xml 484 BLAKE2B 3542f585439e05e86fc86e11f524c15f10f835fe5419141b6361ae4503dc6dff5d0c9d7bb24134c3722e4ab11d6cad6d450625f7e5edc822b3d0ee82fd8bde48 SHA512 03468e0fa2d56c7241219eb07b1cddc225b5e18f6800a513005f76cd19110b4ad9d8f9b2895107695b6c62c8f276b38bbf544a7651b61f3e83878c94a40b8886 diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.2.ebuild index 4eb6a8bdae4c..fcdb94bb2f13 100644 --- a/sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-6.0.2.ebuild @@ -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 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 1536cab3bfff..dd35eb43b5a1 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -2,9 +2,10 @@ AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d33 AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146 +AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea -DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d -EBUILD kicad-5.1.12.ebuild 5198 BLAKE2B 3293a0a9b260c3a3bf635045a98977ae58b899402cb43e80c9d754df5d9d82859cefc6d56946e877ca10e32d1cde28b747c2fad43c52ae6e7997c8e510963abc SHA512 38c96f65d3f05610fefd77915d55619b86ebe5c508952138b28ac4da60dd3e98bb279a6d172d4b73466361aec16036cf96ff19af23a0555599e71c8c4e60bfc7 -EBUILD kicad-6.0.1.ebuild 4209 BLAKE2B 9f193aa3cf674656688480c7d9a0ccf29dee2773fc09535bb7cde1a212e20e9db2dbda1b61acd25051d1f67f3ec4badc8caa16020ac42c93c4bd738942eee2a1 SHA512 218dec868c50b64f21409f17c8ef3af90c180d737cd4c9feea49e66dba209bc6176dc92497a2efcab8a5995832e0eced0cf7342fc4486f8d80019b52dc39947a -EBUILD kicad-9999.ebuild 4199 BLAKE2B 9bbea2242664b97da6ea28557a430c0f4686b30d40295b53dd614fcec935fe4a091e5768c950d680dc7cf458887e4653fd656b9c6282067a378cfd8c5e06b9fa SHA512 d57ee12d1ffbd72153629e1ba1b875d3215c4a978b7b25c0b6ad1ca75b2026e803701fa29ea6217c9e7c2f197c9e6124e1c23fc5eed88a776188fcfd8dd13927 -MISC metadata.xml 1140 BLAKE2B e7f0b293ca2a8304712fab8165dda2ed527dd93809748e562e56ef0a1a23e3703e56599551eb6a318304e9e0d74a30eb361f497cbc8809c2d82b42ff7f160c1a SHA512 7f4e1ec8886f042ce559d2401b3721b474b2e7c4799610419732aae228fe6583e99ec0b49f12df4ec4bcfd6c5238861c22a200a8f9712d4c5c7d91d0b74a60e5 +DIST kicad-6.0.2.tar.gz 45003563 BLAKE2B 5f6d4fa5af30ba80a3316652112e3624338f0f38352993f0a31588572913d8abb282b8515854235df28ce4b6c4b5255ea03dd6ef81baa3dd080e2ba1fbf57990 SHA512 f21742aee1fe15bb181c7ce5675a0fa7d521b66fa79febd8c8b550abd487a1c122359ed8c8e6dc8bbc8867be339ae4cebe977a3f8e62d8bc40e675e9cc297962 +EBUILD kicad-5.1.12-r3.ebuild 4761 BLAKE2B 284b69c45c30f57275dee607d934030d97bc5c5491099db8eb13278524f61a61911ef540d805a4fc5d4f4361764c8268aa3f3a44004527962ce950cb2b873c2d SHA512 cd7faedd477a30d332b858aad0d1d2a4ef015642ec6a4165d2f03413954119ed4ce68fad6e1a6380d5be7a4a5fcdda6834ada1782137a7b1b7bdd7c0eab2aadd +EBUILD kicad-6.0.2-r1.ebuild 4365 BLAKE2B a21ec4b0534529799ca451a7016383eed57211c87daa806cb0007c3a1990542df4b4dfdbea9735bf7b2a60a02f33ad389a4e6fa9326c7a10f05321c78d04a81e SHA512 a47c8344bc8368d452c949eee060479a21d0b2ac04fca3c9ad3c78082bb19654db9ad0cbfbdb1eaa7d1c419eab5257e6039542f590e6ac97dab69c6076f4da93 +EBUILD kicad-9999.ebuild 4288 BLAKE2B f8ef5cd6f731cfed3a93986ba240e5272f706f33d1ab9a89a7ecb7bb9c77b5b635a106be381b3eb5300c52ca637a294137c39736fc5a05fdfffa2e053b920886 SHA512 aa1d909d5d23de7ca3406ad612d53aaf4f98d7df8cf5cdee6ebb1c645e535fe71ea3db0c023a8f00f1e2022cf4f4ff70372155563f1ed772c5427c7aeaf45f13 +MISC metadata.xml 1047 BLAKE2B 1ed5807dc4f194f6f66e6e0743fe186dd046128bfec2fd3e2a72919e4cf714b0ac6d1ba7da0764ce0b4202eb0a068e5c3e261dfcccf309198400e8be009b7845 SHA512 dc7b727047452b1398fe4029c3b7e70826074733be7c1f2c6c2d485948380da208561a738427d0a5f8a67dbec07593c529b4f8b6690b8a5de7b3bb291576ab59 diff --git a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch new file mode 100644 index 000000000000..d52a05d3bcf5 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch @@ -0,0 +1,12 @@ +diff -Naur kicad-6.0.2-orig/CMakeLists.txt kicad-6.0.2/CMakeLists.txt +--- kicad-6.0.2-orig/CMakeLists.txt 2022-02-10 16:29:07.000000000 -0800 ++++ kicad-6.0.2/CMakeLists.txt 2022-02-13 20:09:37.244713966 -0800 +@@ -950,7 +950,7 @@ + ### + if( UNIX AND NOT APPLE ) + install( DIRECTORY scripts +- DESTINATION ${KICAD_DOCS} ++ DESTINATION ${KICAD_BIN}/scripts + COMPONENT resources + PATTERN "*.bat" EXCLUDE + ) diff --git a/sci-electronics/kicad/kicad-5.1.12.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild index 3957488f0a2b..34fef8a30277 100644 --- a/sci-electronics/kicad/kicad-5.1.12.ebuild +++ b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,13 +16,12 @@ 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 +oce openmp +python" +IUSE="doc examples github +ngspice +occ openmp +python" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) - ?? ( occ oce ) " - +# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301 COMMON_DEPEND=" >=dev-libs/boost-1.61:=[context,nls,threads(+)] media-libs/freeglut @@ -36,8 +35,7 @@ COMMON_DEPEND=" ngspice? ( >sci-electronics/ngspice-27[shared] ) - occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] ) - oce? ( sci-libs/oce ) + occ? ( <sci-libs/opencascade-7.5.3:0=[vtk(+)] ) python? ( $(python_gen_cond_dep ' >=dev-libs/boost-1.61:=[context,nls,threads(+),python,${PYTHON_USEDEP}] @@ -103,7 +101,6 @@ src_configure() { -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)" -DKICAD_SPICE="$(usex ngspice)" -DKICAD_USE_OCC="$(usex occ)" - -DKICAD_USE_OCE="$(usex oce)" -DKICAD_INSTALL_DEMOS="$(usex examples)" -DCMAKE_SKIP_RPATH="ON" ) @@ -114,23 +111,10 @@ src_configure() { -DPYTHON_LIBRARY="$(python_get_library_path)" ) if use occ; then - if has_version "~sci-libs/opencascade-7.5.2"; then - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.2 - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.2 - ) - elif has_version "~sci-libs/opencascade-7.5.1"; then - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1 - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1 - ) - else - # <occ-7.5 uses different layout - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) - ) - fi + mycmakeargs+=( + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade + ) fi cmake_src_configure diff --git a/sci-electronics/kicad/kicad-6.0.1.ebuild b/sci-electronics/kicad/kicad-6.0.2-r1.ebuild index 4efd1ddc6a91..2d3156fe68e9 100644 --- a/sci-electronics/kicad/kicad-6.0.1.ebuild +++ b/sci-electronics/kicad/kicad-6.0.2-r1.ebuild @@ -21,7 +21,7 @@ else S="${WORKDIR}/${PN}-${MY_PV}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi fi @@ -34,6 +34,7 @@ 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-1.61:=[context,nls] @@ -56,7 +57,7 @@ COMMON_DEPEND=" sys-devel/gettext ) occ? ( - >=sci-libs/opencascade-7.3.0:= + >=sci-libs/opencascade-7.3.0:0= ) " DEPEND="${COMMON_DEPEND}" @@ -73,6 +74,10 @@ fi CHECKREQS_DISK_BUILD="900M" +PATCHES=( + "${FILESDIR}/${PN}-scripts-install-fix.patch" +) + pkg_setup() { use openmp && tc-check-openmp diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index 129d19372060..9ca55665856a 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -34,6 +34,7 @@ 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-1.61:=[context,nls] @@ -56,7 +57,7 @@ COMMON_DEPEND=" sys-devel/gettext ) occ? ( - >=sci-libs/opencascade-7.3.0:= + >=sci-libs/opencascade-7.3.0:0= ) " DEPEND="${COMMON_DEPEND}" diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml index 09d8f72c361a..cd956ca81c5d 100644 --- a/sci-electronics/kicad/metadata.xml +++ b/sci-electronics/kicad/metadata.xml @@ -13,7 +13,6 @@ <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="oce">Enable viewing 3D rendering of designs via <pkg>sci-libs/oce</pkg></flag> <flag name="python">Enable python scripting support</flag> <flag name="pcm">Enable plugin content manager</flag> </use> diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index 6a014d5be2e4..36d061e51d7c 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -1,8 +1,8 @@ -DIST klayout-0.26.11.tar.gz 54455860 BLAKE2B f2e988ef1a68a0d8e612199d1a930a55c9175bebb8ca4cbbedef425d6367ddd3e56999502e0fb4c38043e2f7bf2c75c3acb18c498124c5850379bbfe283cb218 SHA512 c868830494a7181bbc68f543930aaf87a189b5063d212191305a3d2e119921175ff66aa2f87f9a89e8e9e5d8bf2c47ed32b5cd1fb43b85619ee35d8a3ddc063b DIST klayout-0.27.3.tar.gz 57274694 BLAKE2B 131791f7e978a5ffd344d1dab15d0d245d971855d34c995b4f86173f31853f71ec79d089cc2f80a10d318b108cb0f624c9610c9bf51f0bd88f2265e2d8871c97 SHA512 5f3a83cbbdc171acf200a90e4758942e7c3dd4ec66666576c6ecb041326e52a99222992e844d63f939650374a7493f542b1412ada714b6c0271103facb5acaa9 +DIST klayout-0.27.7.tar.gz 57348398 BLAKE2B c717d1041e2b2f1ec4835db3861a8c7ff15d2cd703d3424d9219cb0fab06471a6838503c882b841be45c9e1b9280d1f7a099f9824c6e286940d3b44713927974 SHA512 f4b4f3f2216307df5dca3b9c9c4eee5b45e5811a3307f36d3ad759d33beb8cd83880485284492583b891ee8bbf2866cae0ce87b5c5971478d8ad8daad315bb09 DIST klayout-0.27.tar.gz 56917189 BLAKE2B 41a66939d6d7a058f9dc1772ba152ff1c311b146f7e2b37da52447cbd7eacc35a26a5fec1516384619ab0680a145f82a120ee7ee2739a5c8e9648836afa07d13 SHA512 475e2d905bc75a13c924f6cd1d08b566ecde92a28ed6a32b1995452e0446d4c75f7856ce3af4430a3b39a3876a3817923a51f3675c5afb33f4ec749acf15e0b4 -EBUILD klayout-0.26.11.ebuild 1855 BLAKE2B 653a28ceb51d5f422bebab200dd39fab0c3fe345697a6ebce3e6035b6a96d1e75622f73ed4e8562bdfa341fd0467309d3efeeceb3d9617c8b601eea1bbbbbe6c SHA512 4eb5bd656bceb1e6684e73e9b2cba0cc6085866423b055a0bbebbb1d7ec4e69488a87a8d6dde7f97b9e4043bec283b1f1ddff5493fbb514344c7ccd04b43d491 -EBUILD klayout-0.27.3.ebuild 1872 BLAKE2B 90aa3094b6c349087d8b8d1ee02131955101ebd8640ddf3bfe64b1209505a344a10ddaf8b2d61300aba1406da9a544e69dc7ea5967c6735a8d72b4062858122e SHA512 2e424b127004f6bc142848b53575c6730d362835eed27efc74109f7664d1115c562c11aa0c48c0e2cc804cda2f24dff3cbb6c3d822ddb198a674f829eebb1a2e +EBUILD klayout-0.27.3.ebuild 1871 BLAKE2B 2a905fc85ec4e5a63d46cf2f484f72797d54f2fc8095777bed11104e1b9cbd8a174173451c8afcea60d4e806ac80986cc69b2767b2d897fadceffc36126f3872 SHA512 a7040076ab94067fbf063eece75cab5a0cb5fd0ea7d935d1baf10392063d3cfa4fdb1b2ba8c8b1852a4b155819f8da527b7a746bf9b2b3a946a1a90e1997b216 +EBUILD klayout-0.27.7.ebuild 1872 BLAKE2B 23ab8a4900c1e1354e9f26f0909a6729710ce43327752773bab1406f48e4f7b0383ed3ca0b5203b8f143e600a146e0dc9bb1bd7165e0f875caad8399ee1ba744 SHA512 cf8c25472ce557b9a20421efc551325c44f4ba6d8e778f8716bcdc7738d7a72fa591c4ca4313eca74f7914bac5330a71bd97185c68c2db220fb53cf1beead999 EBUILD klayout-0.27.ebuild 1855 BLAKE2B 653a28ceb51d5f422bebab200dd39fab0c3fe345697a6ebce3e6035b6a96d1e75622f73ed4e8562bdfa341fd0467309d3efeeceb3d9617c8b601eea1bbbbbe6c SHA512 4eb5bd656bceb1e6684e73e9b2cba0cc6085866423b055a0bbebbb1d7ec4e69488a87a8d6dde7f97b9e4043bec283b1f1ddff5493fbb514344c7ccd04b43d491 EBUILD klayout-9999.ebuild 1872 BLAKE2B 90aa3094b6c349087d8b8d1ee02131955101ebd8640ddf3bfe64b1209505a344a10ddaf8b2d61300aba1406da9a544e69dc7ea5967c6735a8d72b4062858122e SHA512 2e424b127004f6bc142848b53575c6730d362835eed27efc74109f7664d1115c562c11aa0c48c0e2cc804cda2f24dff3cbb6c3d822ddb198a674f829eebb1a2e MISC metadata.xml 381 BLAKE2B 604883a849553c3794ea564abbbe12b612ca34e78859c29a7ed0845c103673f4a9c70f92ba8e980d9197a80fe12c065c6b4244bad0ca49070e81432b73cd61d6 SHA512 aef6fefcb173057d5a1db629aa0ab736c1e3cb64f14c1bfe05e90af76c04e44503d1ec621c86ca0de55467ed73a7077fdabf69601ca7a6ab26d4718e309876d7 diff --git a/sci-electronics/klayout/klayout-0.27.3.ebuild b/sci-electronics/klayout/klayout-0.27.3.ebuild index fa9d57d2fc67..01355f2e03c4 100644 --- a/sci-electronics/klayout/klayout-0.27.3.ebuild +++ b/sci-electronics/klayout/klayout-0.27.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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.26.11.ebuild b/sci-electronics/klayout/klayout-0.27.7.ebuild index 6eb043c6d1be..40bfbeb1351d 100644 --- a/sci-electronics/klayout/klayout-0.26.11.ebuild +++ b/sci-electronics/klayout/klayout-0.27.7.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 RUBY_OPTIONAL=no -USE_RUBY="ruby26" +USE_RUBY="ruby27" # note: define maximally ONE implementation here PYTHON_COMPAT=( python3_{7,8,9} ) @@ -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" @@ -57,12 +57,12 @@ each_ruby_configure() { ./build.sh \ -expert \ -dry-run \ - -qmake "/usr/$(get_libdir)/qt5/bin/qmake" \ + -qmake "$EPREFIX/usr/$(get_libdir)/qt5/bin/qmake" \ -ruby "${RUBY}" \ -python "${PYTHON}" \ -build . \ -bin "${T}/bin" \ - -rpath "/usr/$(get_libdir)/klayout" \ + -rpath "$EPREFIX/usr/$(get_libdir)/klayout" \ -option "${MAKEOPTS}" \ -with-qtbinding \ -without-64bit-coord \ diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest index 2307b8661489..88a15337d75b 100644 --- a/sci-electronics/ngspice/Manifest +++ b/sci-electronics/ngspice/Manifest @@ -9,5 +9,5 @@ DIST ngspice-36.tar.gz 8450071 BLAKE2B 51fa2c5998e96a05deb3764f56659ed0970d6362f EBUILD ngspice-31-r1.ebuild 4393 BLAKE2B 97d73472447291f088d3a742781010a7dd40b0674c6a0059b15c592f4cb9f9919868b93486c2fd11f8896a0e8719b3378ff80a54ed2aa93b2b6fb67d13c7bcc5 SHA512 f450f605ee8630ce1c2f190ecbc287ef4a6b60ab72ba44e686670cf8a779b83e80d3e839434df9a4c88334907284d046d9e685aaf9ac45ed727ff5da54efca24 EBUILD ngspice-34.ebuild 4503 BLAKE2B 8b039ded83223c8945abb3868e7030bdfd577bffe37d17334daf21b51272ce86d23df64cc2b2dcc59d7c67237054131e34e9f4122d4ef27fa2aa803d5d904f15 SHA512 a5708e8de8b54cfad67ab1851b7e137c77d7719e4bf4128b943c3f103008405a9c1f14ba8669e0501dcfc2f2dc7afab878e5d94320f8b1a9dbf8b80ee6f8f9d2 EBUILD ngspice-35.ebuild 4470 BLAKE2B 6851ebc6600db725f58fa3ced540ea88fe807cb8b15b6d69735a74407bdc746686d7ba7b12e1fe0a1aa5601dd3109e89917c110f718ed3f10e6d8697da4c9b1b SHA512 949e38987af0b6ad157d20c71b8e0fdc6b533f6c5e24fc43b10e756ac8ece85a7d7d7d09b05b8a1bffb7d977dfb571d2e97b4fd927f93cd81be90b8ba49cc9bd -EBUILD ngspice-36.ebuild 4470 BLAKE2B f118645f2a78f70fe1d05d55a77b6671cba5e7ff1b3dff143aa990f3874a19c99476e8ad4041ec44f53cfbb70dfcfd04c259dae4feb4b8e476412765cb29cbd9 SHA512 2f67d164eb0becbac8edcc4db99bb88f770b8dd81fe369dbdfae44117b37b8105ba402c506f44c768a50b3819151f13f289cec6218fb11e0a8e2e5167381ce46 +EBUILD ngspice-36.ebuild 4477 BLAKE2B cf8dcce5584b77c211bb7b9790a6b2d2f44cd446da73c317966ce31d200d717024fb00ab4270a3ed59bf6303cd77e76cfc044de6d58f5c7022586eeb0067e6b0 SHA512 759239bb68562346512f7ca541793a0afb79801c60fa311d0fe6aa85e7dd476916b31214453abee19e1521775fda63dc228c244071d627c5a29a890c81a975df MISC metadata.xml 677 BLAKE2B 541ff3e8439b8e222916341bb9f973ea2189a5b2aceeb1bd83ca7a73af7161f38e272a93fdbab51aba4f14be53f556c10a5c10be2a807ef07bca9e39fa73b6ed SHA512 b439de3838f17c9c21e50cd80d74b733d0061f79a7e736c82295c3db433bb786cdab8dc73ca1b40f6a486288f29f82b677723ea1e13ca583b0456fcfa82de206 diff --git a/sci-electronics/ngspice/ngspice-36.ebuild b/sci-electronics/ngspice/ngspice-36.ebuild index 607fec459334..ded8f7f1d8ce 100644 --- a/sci-electronics/ngspice/ngspice-36.ebuild +++ b/sci-electronics/ngspice/ngspice-36.ebuild @@ -13,7 +13,7 @@ LICENSE="BSD GPL-2" SLOT="0" IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl" -KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~x64-macos" +KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos" RESTRICT="!test? ( test )" diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest index 0aa9580d79fa..ef6335fcb643 100644 --- a/sci-electronics/xnec2c/Manifest +++ b/sci-electronics/xnec2c/Manifest @@ -1,8 +1,8 @@ -AUX xnec2c-template.patch 1151 BLAKE2B 15d7bfbd8eface8bd0956554a561fe4c2efe09f125d3355a29c9968b3fa0f79b8168f6a6790b68f842c513514467aa55da199e46cac17e67fa26d75b1f52b559 SHA512 8fc56c88ede75d5b12f226ad5dde39fd8c27566ffb53ef8f794ebc42f6d4c30c6201752a56a1941d1a01372937c89aba8913a987ea66601c5141c3f4ff7abce3 +AUX xnec2c-4.4.5-musl.patch 1665 BLAKE2B ffae40f94d3cc185fab213182741fc6c4175a60838e15aa4ce1efdbf13168352b47b64955ec461625a69c37f16028350cfd11d132ed5b28797d322f5f5ccc273 SHA512 48aa6ca3abfd1aa7c8866adaae262d115bfd0836e4de71fc0367e55d8f98395ff6940cd21eaf0d423726c49e9b49c8c57f8c069bae3b6a38bfda6cd11a5d4827 DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980 -DIST xnec2c-4.2.tar.bz2 939408 BLAKE2B 5fbecf436bfebb6979c12d7f76d708a21d784ee5f4f38c6010c5fd16ebe5324ea5469ea578c4ac7fabc26a82e7ea5d5bf6206be79482a9e454183c7b082a20a8 SHA512 bc0929e3cb01eb355c1eb8615087cc70c4585db75d0e6664237e8e268c5dc2159ec9852d917c9fe6b06a3fa780d7ae0b806c2e5cbf48a60622ee4558d9d82063 -DIST xnec2c-v4.3.4.tar.gz 974922 BLAKE2B e6243ca37bf5acc91e523c8444121afb7b56d4cdfcf64120987aebde321ddaecc4c63653e60353d300c987af65e5ecc4f441b4f1aaa72ed88bbcd0833da89d40 SHA512 5b29b6679117e384d0f0c671a5ed3a902012fd18832e89af894cdb26ac7ec4e7e9de5a4195b7fc81de1481ad253fb77483ee05f15ed608a3cfaa32de4071918c +DIST xnec2c-v4.4.5.tar.gz 972268 BLAKE2B d68b525324ddc8a621e7b186364031b3739210aea9581347e1fa38916eefb97f7ef3d7e5b8f673d9fd514dea36815ebc3f9d17d3a6eea26af90d5981ad738828 SHA512 8edf19357d619bfc9fcf2ed29380b51d8dc5e8dd1f7fa798a01f15652e0c5c65217e1e8797be6118a655d124dcf1fe8f3d959744128d75afef5c60738864d3cc +DIST xnec2c-v4.4.7.tar.gz 977084 BLAKE2B 1bf17da252e9a1a38613a7d0e808f190ddb704af9903b897fdd5d68f1942d0c65ac43e9daa6d10b311c866733e96d216f3f610b6d5e7f957ad0230e6e35cfb8d SHA512 d9ed8bf0eaa43fb4cf77997e71af6c70c5be120e2979ea6036af20caa1886897a543f7d7ec75df907f3f1c2adf55e1c4fa5e95f9fde034ebdfc51e932aaf674e EBUILD xnec2c-4.1.1.ebuild 785 BLAKE2B 525e838b9b4b95226960ad3b63d4b0d3287e22d8bc95e0071afc0f3fb9b8fe049a4ee0b71ba42f75faab02521629df012825768d0f052c1de4aa97c2f5adc954 SHA512 e350dba8b64219dbd4ddbccd31c135b97bf2c62133d6d6a7dec1b4eeb06df2ab86851dd4aed32555b6a3ca53850f0b115c73d94df697449b6463c89e56c9b584 -EBUILD xnec2c-4.2.ebuild 844 BLAKE2B cdccb4f13a87d7b15167f9ed7947cf77ab0664cb4e26cd6baa24c3809c9a21b1a1c6b213c2fefd4b1785acddfdbf7b1ef7a7503dd6a92dc97df9c1c70f01a305 SHA512 ca610d1ea30afa58c2349622d19336aa6a520c3c97ea2c995359e917341a8d017d273ea4e030fa2b2176b21e628294670dcf4d6596ab9cda565bea8ec07d474d -EBUILD xnec2c-4.3.4.ebuild 860 BLAKE2B 2a0d6328a440a3d166dc64c955a21d5772058f02609f1eac883ef93be96b507c20eb9f80ebc818bb4d8c7b08efdd29cc956313e66b542149be6f5247d666093c SHA512 f34b463bcd2a47577caac07aac8d255d69de784eb77ae296605b4e9e436793e5eaed9a6a794f17a82ad0e82a3b33e7d0f5bbd18cf96d7bd34d489c33e0f07ce6 +EBUILD xnec2c-4.4.5.ebuild 942 BLAKE2B 359d6b68c87dea093bc8018b155ff5fdbec8e35a1ec87b56c9747711a902cd1a31bb6cc320418155bba8c8c7df71f649e75114d730d75d172109bc99b99a3487 SHA512 9e25b2180fa198e078e52a171ce5cc87fe43eb275975d4b61736187e71004b2d0bdd7f2146357a247ceacd6f2fdafd545ab265370f427b40a74c8de9d494610f +EBUILD xnec2c-4.4.7.ebuild 871 BLAKE2B f923008332242221b146c06e7ab9154c47f3751f6b0ad3c2e18da9e9b2eb5766301fe61dc84908d9e7e66d6ababad6a23610c7229cfda290a15d4b4837a273e5 SHA512 e4350e264abbfa90a71132a85cb5df9dbe132f3cef6403d04103ead85e37ab7557193d56ac769c61b4f265dac2803a1965392d806b33f1514ed0994459a63e01 MISC metadata.xml 1635 BLAKE2B 97a6599a38ecf5914360b4e5376fcb6be56890a91e0274027c327d69fd41459a740a5ad4e2255e48c676bfabbc60a5fc3abd13fa7f9157ac3572e24fa11752a3 SHA512 7564946c202c11ab3be96071962e07870fe97433fae5a9998dbf0cc62de0c83885fadb71741a824aa45e643641baa77bb887ea70687fa15559119fd22d83eed3 diff --git a/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch new file mode 100644 index 000000000000..a995463224b0 --- /dev/null +++ b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch @@ -0,0 +1,63 @@ +diff --git a/src/mathlib.c b/src/mathlib.c +index 5354240..b28033e 100644 +--- a/src/mathlib.c ++++ b/src/mathlib.c +@@ -155,9 +155,6 @@ int open_mathlib(mathlib_t *lib) + return 0; + } + +- if (dlinfo(lib->handle, RTLD_DI_LMID, &lib->lmid) == -1) +- printf("dlinfo: %s: %s\n", lib->lib, dlerror()); +- + // Call the init() function if configured + if (lib->init != NULL) + lib->init(lib); +@@ -217,14 +214,7 @@ void init_mathlib() + mathlibs[libidx].available = 1; + + // At this point the library load was successful, provide detail: +- if (mathlibs[libidx].handle != NULL) +- { +- char lpath[PATH_MAX]; +- dlinfo(mathlibs[libidx].handle, RTLD_DI_ORIGIN, lpath); +- printf(" loaded ok: %s/%s\n", lpath, mathlibs[libidx].lib); +- } +- else +- printf(" loaded ok.\n"); ++ printf(" loaded ok.\n"); + + // Set the default to the first one we find: + if (current_mathlib == NULL) +diff --git a/src/utils.c b/src/utils.c +index b803402..1462df2 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -17,7 +17,7 @@ + * https://www.xnec2c.org/ + */ + +-#include <execinfo.h> ++//#include <execinfo.h> + + #include "utils.h" + #include "shared.h" +@@ -736,18 +736,7 @@ void _print_backtrace(char **strings) + // Return an array of backtrace strings. The value returned must be free()'ed. + char **_get_backtrace() + { +- void *array[10]; +- char **strings; +- int size; +- +- size = backtrace(array, 10); +- strings = backtrace_symbols(array, size); +- +- // This wastes an array entry, but allows _print_backtrace() to find +- // the end of the list without realloc'ing space for a NULL: +- strings[size-1] = NULL; +- +- return strings; ++ return NULL; + } + + void print_backtrace(char *msg) diff --git a/sci-electronics/xnec2c/files/xnec2c-template.patch b/sci-electronics/xnec2c/files/xnec2c-template.patch deleted file mode 100644 index fa09bbdb9830..000000000000 --- a/sci-electronics/xnec2c/files/xnec2c-template.patch +++ /dev/null @@ -1,28 +0,0 @@ -# Install template files in /usr/share/xnec2c -diff --git a/Makefile.am b/Makefile.am -index 9e8873a..6f6203e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -62,7 +62,7 @@ install-data-local: - $(install_sh_DATA) doc/$(PACKAGE).1.gz $(DESTDIR)$(mandir)/man1/; \ - fi; - if test -d .$(PACKAGE)/; then \ -- $(MKDIR_P) $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/;\ -- cp -r .$(PACKAGE)/* $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/; \ -+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/$(PACKAGE)/;\ -+ cp -r .$(PACKAGE)/* $(DESTDIR)$(datarootdir)/$(PACKAGE)/; \ - fi; - -diff --git a/src/main.c b/src/main.c -index 4cb541e..6883ceb 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -88,7 +88,7 @@ main (int argc, char *argv[]) - /* Create file path to xnec2c examples directory */ - exe_path[bytes] = '\0'; - Strlcpy( file_path, exe_path, sizeof(file_path) ); -- Strlcat( file_path, "/share/examples/xnec2c", sizeof(file_path) ); -+ Strlcat( file_path, "/share/xnec2c", sizeof(file_path) ); - fprintf( stderr, "xnec2c: creating xnec2c config directory from: %s\n", file_path ); - - /* Create system command to copy examples/xnec2c to ~/.xnec2c */ diff --git a/sci-electronics/xnec2c/xnec2c-4.2.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild index bdc030a2fa5c..6c495a7c80f8 100644 --- a/sci-electronics/xnec2c/xnec2c-4.2.ebuild +++ b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild @@ -1,13 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit autotools xdg-utils +MY_P=${PN}-v${PV} + DESCRIPTION="A GTK+ graphical interactive version of nec2c" -HOMEPAGE="https://www.qsl.net/5b4az/pages/nec2.html" -SRC_URI="https://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2" +HOMEPAGE="https://www.xnec2c.org" +SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -19,21 +21,26 @@ RDEPEND="dev-libs/glib:2 DEPEND="${RDEPEND} sys-devel/gettext" +PATCHES=( "${FILESDIR}/$PN-4.4.5-musl.patch" ) + +S="${WORKDIR}/${MY_P}" + src_prepare() { eapply_user - eapply "${FILESDIR}/${PN}-template.patch" + eapply ${PATCHES[@]} eautoreconf } src_install() { default - docompress -x /usr/share/man - dodoc AUTHORS README doc/*.txt + + rm -R "${D}/usr/share/doc/${P}" || die + dodoc AUTHORS README.md doc/*.txt use doc && dodoc -r doc/*.html doc/images - if use examples ; then - docinto examples - dodoc examples/* + + if ! use examples ; then + rm -R "${D}/usr/share/${PN}/examples" || die fi } diff --git a/sci-electronics/xnec2c/xnec2c-4.3.4.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.7.ebuild index dee965c2daa6..c9403b6d6ff4 100644 --- a/sci-electronics/xnec2c/xnec2c-4.3.4.ebuild +++ b/sci-electronics/xnec2c/xnec2c-4.4.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,19 +25,18 @@ S="${WORKDIR}/${MY_P}" src_prepare() { eapply_user - eapply "${FILESDIR}/${PN}-template.patch" eautoreconf } - src_install() { default - docompress -x /usr/share/man - dodoc AUTHORS README doc/*.txt + + rm -R "${D}/usr/share/doc/${P}" || die + dodoc AUTHORS README.md doc/*.txt use doc && dodoc -r doc/*.html doc/images - if use examples ; then - docinto examples - dodoc examples/* + + if ! use examples ; then + rm -R "${D}/usr/share/${PN}/examples" || die fi } |