diff options
Diffstat (limited to 'sci-electronics')
-rw-r--r-- | sci-electronics/Manifest.gz | bin | 8561 -> 8560 bytes | |||
-rw-r--r-- | sci-electronics/ghdl/Manifest | 2 | ||||
-rw-r--r-- | sci-electronics/ghdl/ghdl-5.0.1.ebuild | 2 | ||||
-rw-r--r-- | sci-electronics/kicad/Manifest | 3 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-9.0.0-r1.ebuild | 7 | ||||
-rw-r--r-- | sci-electronics/spice/Manifest | 3 | ||||
-rw-r--r-- | sci-electronics/spice/files/spice-3.5.5-makefile-exit-on-fail.patch | 66 | ||||
-rw-r--r-- | sci-electronics/spice/spice-3.5.5-r4.ebuild | 10 |
8 files changed, 88 insertions, 5 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex 666049016457..b90c08af6b8f 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest index 2565b359c8ff..24a72b26483e 100644 --- a/sci-electronics/ghdl/Manifest +++ b/sci-electronics/ghdl/Manifest @@ -3,5 +3,5 @@ AUX ghdl-4.1.0-tests-fix.patch 6625 BLAKE2B b5d6a46ff2e27d11e526fa0967e237826dc1 DIST ghdl-4.1.0.tar.gz 7704716 BLAKE2B d69791d947ed11b62fac8e076c3b9e1bad606a0de57e8d5bd67c9a8f7ea0cad73643085efbaaa06fabdd5900366334b63385589da72f4db488f5b27b142a76f8 SHA512 0a3a465f7f8ed7fba9b81b5dec2903bf82731c97a127666e7644286c9ea80078354be4e6bf8947a6ef631b646dc7e8e69dce2d9a467ac36ee03c67d9335a2703 DIST ghdl-5.0.1.tar.gz 7851730 BLAKE2B 110f17e7891a4e89aaa27e763f1f8c0354bd6054641b1a17c1f037b5b07a573781c36a3657a0501252b76c03e63f485f2099fcee59ef451aab17939cdd20a222 SHA512 c07dab30b779f0dd424e588b66d32351bdfcc9cab6da5bb5ea85c477083bda6a0f99c2301e55bb2c285d7765911a0fc0b0c8079933b1abdda553d126f2e58400 EBUILD ghdl-4.1.0-r2.ebuild 1781 BLAKE2B 99d11c4277126b9e922f43a06eef0b23bf88d4ddbbc3eb0089422c64a4abed19f8e057009d618691a1a631e9009fa033913b5778978cadf69bd0b658dd8fc222 SHA512 152643870bc40acdce297e7d5ea6bd5b4a4e4950f974159e349d5bad51e7233b064a2ac34ce1f900498f70d2539aca858149a61ee48cd3533805bb9691f42f0d -EBUILD ghdl-5.0.1.ebuild 1734 BLAKE2B 9abbcd81b6eaf2fd9f997c35552ec2b8f8200f5441b08330b923e2a07ee219e4967ee56f4cf4c01d66322a8182cd3ef898fc54f01830ad4e86d27e4c5e0350d0 SHA512 30b623a8c55d9d1140b8793ec6e444eae79be35af78ca5fa7871d66d6f99a4e79aa4613b8de663c36d0af028501c2ca019f395b381ce2b07a546d1ce26ccc727 +EBUILD ghdl-5.0.1.ebuild 1733 BLAKE2B 4339868609ea78d85b3b01a48e9d7610008ebc90cc41f1ca49513fc78ec433dbd652a9c6c26ecf8789b3ac15b1f57e38e3ddd82d91dd5cd924eadcc451478ce2 SHA512 1f69ae1e7cd576a37e4068ac87fa79b9acb2e7e0bbbb023d689f16d7f3a21666c62f24f3c1ee0527f2d3e1b32e79133a4d40c7510f39ab190bc39f39ff5d5322 MISC metadata.xml 1462 BLAKE2B a403ab50a3463fc26ddfb6ad65aa2cfe9782e98b74cd91fe24ef81678e7c52a2211b0bcad27accc4cd57db281ed23ad5d8697ae69dd8b67c623465949d6d3434 SHA512 4bd4c20a8fbbdaa80a63373f81bd96144e110371403832627aba81a7a95d073ee73922516a6d5c193898affbeb8bd7f1ce9fc4203faa13464cf39ba809c82d5d diff --git a/sci-electronics/ghdl/ghdl-5.0.1.ebuild b/sci-electronics/ghdl/ghdl-5.0.1.ebuild index 741bd0ca7663..cc950f0ee2f7 100644 --- a/sci-electronics/ghdl/ghdl-5.0.1.ebuild +++ b/sci-electronics/ghdl/ghdl-5.0.1.ebuild @@ -20,7 +20,7 @@ else SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="GPL-2+" diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index f6724da21b18..bcb0fe78093c 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,8 +1,9 @@ DIST kicad-8.0.6.tar.bz2 72953578 BLAKE2B be13ebeba9b9c8d1316074870e9f58fa8629d6cdc2a9ca9aac20f4bea0b743e8da86e711692515d4a817372822fe7305e426d65d8bf3a7729f2ee039c6b7c0ec SHA512 6c35830c9314b801970a4af4100e3ffc30d1c4eaea9a806f8c23f22d2d3d46743d70b9748b757f0b990b9e394aa97edf45da0d484274faa2f20ba1d83ff6b7b4 DIST kicad-8.0.9.tar.bz2 73236341 BLAKE2B 707dd199f0232a383eb70ee565b32fc8f24691006d0bfcebe3cd7e99e8d60b70d12469b26030084c9bf87c4f4fb6ec282f640f14020c0265546c896b456e4750 SHA512 cc822c46adea5a3dab3fd6c383c9cc1efebb3e9d1e88a0237caf6e9ef1fd0c249328e9afbf4a138cc19eda1aad864e2854fabd3bf17763109dce57e335be38b2 +DIST kicad-9.0.0-protobuf-30.patch 1054 BLAKE2B 64d084b9ed97a283e3a9cb32721ce0c90fc13555a71c07dcfd0878a20f43660a00e17fd45d2250b1cf421acd43214de6b8c4906f90726652ebd46254e8db06b2 SHA512 0453efd6b94ba5dee94b3aed3d5108ed1bed342f549225caceb236de418f426f24784728c3c81eb46182bf8ff9e20e4dc7dd6c95b09cc7a199c51d383bde010d DIST kicad-9.0.0.tar.bz2 128194997 BLAKE2B b5083fbe6bd219711c0ddf1204c283ac588829a24cc46c9e4e93300f046c6a3d890a2924cda803ae41920b74bbc5f16804317a8babc68d6c3b191b5d8cd23b42 SHA512 3b6d346d9a8d42c0ed9185427a99d78fbd9d789170aed6b9a7c6983eb58e69a1c20a7ea1b98769aa3d8121f641ca05cd8540e67f33448da2f6202f4abbc6de16 EBUILD kicad-8.0.6.ebuild 4495 BLAKE2B 355a114f15773b309e6bc3f94525a72611494f3ab91b240c5e7d51e6757730777340f620f8363612d4ef18edee35bcc2b52ea89e11b30ef018350c922f51c91b SHA512 beab84f7c79c4e29b91a725d8f2406567e5c86a4ce74b88ee11de905487f74022c84834460738ee51c1d63050ea130b49d9e2b299be0f06a7b3e8814d1dd444c EBUILD kicad-8.0.9.ebuild 4496 BLAKE2B 7aee3f4e27d8fdf642be42603cc3f49c7c22fa0bb0789b451d4aa87f1974acfc4527a8d4e1df2635ea811ef5c00600aabe04fb7037c92ccac479791dd12744ca SHA512 8d3be157c026cb59e19f8d8903da04ba6ff629eeb11fb4a273bf0823091275beec5d3f57f84527d8b56e9accb43716bd947da85a47327a194ddd6ecec8aaba93 -EBUILD kicad-9.0.0-r1.ebuild 5826 BLAKE2B 72638a8fb32076109d39962bfe4c67e1f2884bf97fe80f81ed93856f62f736c1deda291ba8519e285f06d8ed8eb536b171e6d4c588bda5415ec80734de5f52d2 SHA512 558e22e34a241f45e50b44a1fb766c32f6dc35cb341a0ac3773160eb2eb7a9a44dafcc36b1f6587ddbdef92a9427bba2f6abe5365749b9c6b2f38af409667709 +EBUILD kicad-9.0.0-r1.ebuild 6034 BLAKE2B 9d09aa526e9634b210e1663d797a4f2319038be99d0b7922f18e687132584d117d3fca0a3b1b252fa9124e78d964ee0ff37a231644c41c501fc003a55bfdea77 SHA512 763367763ec8ece3dc40523d2ae86772e65e97d73239b42dc0b3b7219d4c4b9a5ccdb72ef6dbfbfa068732fe571b47904bf7d25429ccf4260c8feb21241ef3a0 EBUILD kicad-9999.ebuild 5825 BLAKE2B f1b988df25d94bd8ea940c0aa1309e992d4940dbfffc2cbc97a8badef94050ed02e5fd81698c22382ee648aaace8b056e2c046e8f6be53ea02579200d00843cc SHA512 6073a43a8819c55b5355e43efb6b32c47ee7571def6d030a35bc8886f444f8539c924dc5c915a537141c8ccb8569ebad82fc2bb52c0fb0246d72060c598c0aa7 MISC metadata.xml 811 BLAKE2B 4f2150b49b1bebf73aa3440ae1ace1624ce02e022d361051e895a18d28f2ab802fed04c94552b36fc0265335a1eacd5d3a7c407fc88f0c4f7de9e4fa6afa6c5f SHA512 c09c2143516f361a8553ab5c44ffa47c77c7a8dbf53596dfe9ba81378c1a7e3aee8378353950cd8805b675d0a29444848fddd4acfe107a54e3f56e87183a1c6c diff --git a/sci-electronics/kicad/kicad-9.0.0-r1.ebuild b/sci-electronics/kicad/kicad-9.0.0-r1.ebuild index 9f4304dd9f24..313e6ef6761b 100644 --- a/sci-electronics/kicad/kicad-9.0.0-r1.ebuild +++ b/sci-electronics/kicad/kicad-9.0.0-r1.ebuild @@ -18,6 +18,9 @@ else MY_PV="${PV/_rc/-rc}" MY_P="${PN}-${MY_PV}" SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2" + SRC_URI+=" + https://gitlab.com/kicad/code/kicad/-/commit/5774338af2e22e1ff541ad9ab368e459e2a2add2.patch -> ${PN}-9.0.0-protobuf-30.patch + " S="${WORKDIR}/${MY_P}" if [[ ${PV} != *_rc* ]] ; then @@ -100,6 +103,10 @@ fi CHECKREQS_DISK_BUILD="1500M" +PATCHES=( + "${DISTDIR}/${P}-protobuf-30.patch" # drop in 9.0.1 +) + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest index 6cf425e4c27c..cece1243ecaa 100644 --- a/sci-electronics/spice/Manifest +++ b/sci-electronics/spice/Manifest @@ -1,5 +1,6 @@ AUX spice-3.5.5-arlocal.patch 453 BLAKE2B 63d03a34041e5c53fb93b21a57bd4ef5a4323b1adf248970e04843da294c8c05d83e1dbd25255214902f2c569c53416eebe5beb3f797e90f2aeb56a16690d1d7 SHA512 30ab32d6b89087ac02a2d2a2a13974f3d6da4fbf41979e357b794d46d3bf696b0216839f9570eee67d746663101b4aebbc1ae3e83c7f1b79c22ac5e7d3997206 AUX spice-3.5.5-gcc-4.1.patch 2511 BLAKE2B d9bb215dfcaf595d9f62a4748507342c3b6242f551a8458965e37c13e34432d686f00b91ee27d80451261b8baa9d0bd9616b378b246fc895b0dc1fff0d4975c8 SHA512 9ae98c77d8a95b2ccac03e48d778b431a449f8383938ca2d71dc1d77254a0dade6c159f1723aa9a00ac921379ec210584c32ae7e63a849bd07691d34bd92d5c7 +AUX spice-3.5.5-makefile-exit-on-fail.patch 2430 BLAKE2B efa9445c311c2a6c1deab4bac5d8a1d2a5a1219b8b9bc2e522240fd4e055feed3df82f462c2c1040beffc8b6d7cff7aab9c7ef5200f3925a96645a9e7565e0c9 SHA512 924fe8ca7bc72b8c5496603e0d3479736e2b5575b6c764802faa1457be1cd1aa6877e3538535130a3652167193ec4d369d18cafa2fec5fe98a01acc0dc09244b DIST spice3f5sfix.tar.gz 1377263 BLAKE2B bffc4ae307c8b02db998e412d09ae52cef1aea78ab28d0c0b040f2c253032d0f42978c2d3b0bb0500e78016a35e2064bd50d6f86abdeb1e885bc7f7f0978864c SHA512 a515dbfcf81b302667e4a39b0ee7f02715c2a6a3fb9b3d320d9a4bea81e557c85f14d1e9d01d598d8ad3a6a67a797c2096bc14acc8e5afb41bef51f56b400be8 -EBUILD spice-3.5.5-r4.ebuild 2020 BLAKE2B 3922f3c78fa35dc77c17addf381940f701bbece8bdaa8ddaf5bff895deb072e53926880c1855ba64587aafcce5c628d880be37e0826902b32a6249d3c298088c SHA512 e668013d39204814505efd17f469093a402f6bb6897ea6c586f37118627edfaae1948f71645c286c07a7f0d99ee84bc645ff528c56ef4181ef56dd264f26926b +EBUILD spice-3.5.5-r4.ebuild 2345 BLAKE2B 30f4b1cd62153153f6eac36e3d067fc2f82c8dca2cb2ffb66628b61e00610f170803724276ed7f38cde2944eca1932c63b40cdd0a726a2c0e8d458aa9a9b5184 SHA512 072da5ac711344acbcb0c31a118d270bce10606af718f187c18aba11e1b9b2e08f608a464cf8a71477865fc9bfa9bd10bd48ad43db8a0382789c29ab198a1bc4 MISC metadata.xml 796 BLAKE2B 895d71188de1aa825622a54bc39894209e783a14bb7d611d08f54800c02cf42869d10e56827c864ebdd77599b1700a3814e72f24dd25beb162b8cff677f7699d SHA512 0c661364645513cc53a25ff0d292b86254c1dce6cf0336210980dea9c47f8ac5113b4760a61237da27a4f167c822452e3a227ef3a9023b33604732fe3acb7eae diff --git a/sci-electronics/spice/files/spice-3.5.5-makefile-exit-on-fail.patch b/sci-electronics/spice/files/spice-3.5.5-makefile-exit-on-fail.patch new file mode 100644 index 000000000000..f0af690c9fef --- /dev/null +++ b/sci-electronics/spice/files/spice-3.5.5-makefile-exit-on-fail.patch @@ -0,0 +1,66 @@ +From 57beed0c071b159695a8695de23325bdfd5f1ec6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Thu, 3 Apr 2025 20:51:10 -0400 +Subject: [PATCH] src_compile: exit on failure + +This "build script" wraps around `make` in some horrifying ways. And as +a result, if make exits with an error this is ignored. + +To cap it off, the entire software is based around recursive make -k so +it takes forever to build and return errors. There is no point in doing +this just to get a failed build; be more responsive. +--- + util/build | 2 +- + util/skeleton/make_std.bd | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/util/build b/util/build +index bf4bbcc..c740858 100755 +--- a/util/build ++++ b/util/build +@@ -172,7 +172,7 @@ if test -z "${DEBUG}"; then + $EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \ + "${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \ + | make -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \ +- VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}" ++ VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}" || exit + echo Done with build at `date` + else + $EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \ +diff --git a/util/skeleton/make_std.bd b/util/skeleton/make_std.bd +index d4ef591..50baf3a 100644 +--- a/util/skeleton/make_std.bd ++++ b/util/skeleton/make_std.bd +@@ -16,17 +16,17 @@ BUILD_DIR = \ + echo Making \"$(PURPOSE)\" in "$${NEW_NAME}"; \ + cat $(FILES_L) $${NEW_DIR}/makedefs \ + $(FILES_T) $${OFILE} $${DFILE} \ +- | ${MAKE} -f - -k recursive \ ++ | ${MAKE} -f - recursive \ + PARENT="$${NEW_PARENT}" NAME="$${NEW_NAME}" \ + $${SET_COMP} $${COMP_TO_CWD} $${CWD_TO_COMP} \ + VPATH="$${NEW_VPATH}" SUBDIR="$${SUBDIR}" \ +- DIR="$${DIR}" ++ DIR="$${DIR}" || exit + + .c.o: + $(CC) $(CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK) + + bootstrap: always +- -@if test "x$(DIR)" = "xsrc/"; then \ ++ @if test "x$(DIR)" = "xsrc/"; then \ + if test ! -d "$(OBJ_DIR)"; then \ + $(MKDIR) -p "$(OBJ_DIR)"; \ + fi; \ +@@ -41,7 +41,7 @@ bootstrap: always + $(BUILD_DIR); + + recurse: $(PRE_PURPOSE) $(UPDATE_TARGET) +- -@SUBDIRS="$(MAKE_SUBDIRS)"; \ ++ @SUBDIRS="$(MAKE_SUBDIRS)"; \ + for xx in $${SUBDIRS}; do \ + if test -z "$(DIR)"; then \ + DIR=$${xx}/; \ +-- +2.49.0 + diff --git a/sci-electronics/spice/spice-3.5.5-r4.ebuild b/sci-electronics/spice/spice-3.5.5-r4.ebuild index 383863ebe1d0..07d33da42157 100644 --- a/sci-electronics/spice/spice-3.5.5-r4.ebuild +++ b/sci-electronics/spice/spice-3.5.5-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,15 +33,23 @@ PATCHES=( "${FILESDIR}"/${P}-gcc-4.1.patch # Bug https://bugs.gentoo.org/783192 "${FILESDIR}"/${P}-arlocal.patch + # util/build never exits on failure, leading to confusing reports + "${FILESDIR}"/${P}-makefile-exit-on-fail.patch ) src_prepare() { # spice accepts -O1 at most replace-flags -O* -O1 + # The code is from 1989, later updated in 1993. It is deeply incompatible + # with Modern C (c99). It also needs `#define linux` from gnu... + append-flags -std=gnu89 + # Avoid re-creating WORKDIR due to stupid mtime touch .. + echo "CC = $(tc-getCC)" >> conf/defaults + sed -i -e "s/termcap/ncurses/g" \ -e "s/joe/\/usr\/libexec\/editor/g" \ -e "s/-O2 -s/${CFLAGS}/g" \ |