5 files changed, 98 insertions, 1 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index cc901d5ce9d5..d3c85f263f43 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest
index a6ffeb032ac9..ada75f5dd0c0 100644
--- a/sci-electronics/spice/Manifest
+++ b/sci-electronics/spice/Manifest
@@ -1,4 +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
 DIST spice3f5sfix.tar.gz 1377263 BLAKE2B bffc4ae307c8b02db998e412d09ae52cef1aea78ab28d0c0b040f2c253032d0f42978c2d3b0bb0500e78016a35e2064bd50d6f86abdeb1e885bc7f7f0978864c SHA512 a515dbfcf81b302667e4a39b0ee7f02715c2a6a3fb9b3d320d9a4bea81e557c85f14d1e9d01d598d8ad3a6a67a797c2096bc14acc8e5afb41bef51f56b400be8
-EBUILD spice-3.5.5-r3.ebuild 1916 BLAKE2B 8477f1b3b5b0b0987ac937bb81cdef1006bc2e3cc2098632c8c32be273055f6992af0fac93bf5bc28afe588daa87cf8198e2ff90f9fc1adff17d2ecc10e8ebf5 SHA512 685d2466f6450696cfa55975c29440f536680a99e5625c3471b357df4ffe1eb7ec48d735b7a1a8296339a4a384e40e57dfd2c06f5df606784baed3ebca3b843a
+EBUILD spice-3.5.5-r3.ebuild 1995 BLAKE2B 2835ac990cec6c7a25c4564d16528ccb25766c8b13b66d8cd3a4785e6caaa77934e42e56b28d1149f492117d8a556a60c1045559525735fc31568dfc80ad50b5 SHA512 c0b4688d39c7ec76a3f31112c7fa517a6ee78a3c4fb05e96ae11b26b65c62e688a0b3d41d25cef36fdcaa9ff1882a5942eb15858953108e62e54a84bafb6fabe
+EBUILD spice-3.5.5-r4.ebuild 2021 BLAKE2B 9053082c12351bdc9e31079a17dbcdac94d7767800f0f0edba38cb15dd2f09541d51037d8756d60cc23023e27cd47e7f8b6ea1c320bd82e30cb1f23d0b03fbae SHA512 b70df25cbe73db3b8645ed130bf6a58fc3cb60c77c5f9185ef51177fcc966d51e43f53dac5865d45833b0075184a1fa1eada8ca79bf9bf56e7d4579588540fd5
 MISC metadata.xml 796 BLAKE2B 895d71188de1aa825622a54bc39894209e783a14bb7d611d08f54800c02cf42869d10e56827c864ebdd77599b1700a3814e72f24dd25beb162b8cff677f7699d SHA512 0c661364645513cc53a25ff0d292b86254c1dce6cf0336210980dea9c47f8ac5113b4760a61237da27a4f167c822452e3a227ef3a9023b33604732fe3acb7eae
diff --git a/sci-electronics/spice/files/spice-3.5.5-arlocal.patch b/sci-electronics/spice/files/spice-3.5.5-arlocal.patch
new file mode 100644
index 000000000000..575726fdb7b0
--- /dev/null
+++ b/sci-electronics/spice/files/spice-3.5.5-arlocal.patch
@@ -0,0 +1,11 @@
+--- spice3f5sfix/conf/deaults.orig	2023-07-23 16:26:09.073788130 +0300
++++ spice3f5sfix/conf/defaults	2023-07-23 16:26:36.772571639 +0300
+@@ -173,7 +173,7 @@
+ #	spice3 source directory than in /tmp.  Set to 'l' (lowercase 'L')
+ #	to use the source directory, otherwise leave blank.
+ 
+-ARLOCAL		= l
++ARLOCAL		=
+ 
+ #	DEPEND_PROG is the command to generate dependencies from '.c' files
+ #	(for "make depend").  Output should be of the form "x11.o: fte.h".
diff --git a/sci-electronics/spice/spice-3.5.5-r3.ebuild b/sci-electronics/spice/spice-3.5.5-r3.ebuild
index c1b8851af6c0..3228789e8fc9 100644
--- a/sci-electronics/spice/spice-3.5.5-r3.ebuild
+++ b/sci-electronics/spice/spice-3.5.5-r3.ebuild
@@ -42,6 +42,8 @@ src_prepare() {
 		conf/linux || die
 	sed -i -e "s:head -1:head -n 1:" util/build || die
 	eapply "${FILESDIR}"/${P}-gcc-4.1.patch
+	# Bug https://bugs.gentoo.org/783192
+	eapply "${FILESDIR}"/${P}-arlocal.patch
 
 	# fix possible buffer overflow (bug #339539)
 	sed -i -e "s:fgets(buf, BSIZE_SP:fgets(buf, sizeof(buf):g" \
diff --git a/sci-electronics/spice/spice-3.5.5-r4.ebuild b/sci-electronics/spice/spice-3.5.5-r4.ebuild
new file mode 100644
index 000000000000..931d96996b3b
--- /dev/null
+++ b/sci-electronics/spice/spice-3.5.5-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="spice3f5sfix"
+DESCRIPTION="general-purpose circuit simulation program"
+HOMEPAGE="http://bwrcs.EECS.Berkeley.EDU/Classes/IcBook/SPICE/"
+SRC_URI="https://www.ibiblio.org/pub/Linux/apps/circuits/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	x11-libs/libXaw
+	>=app-misc/editor-wrapper-3
+"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-4.1.patch
+	# Bug https://bugs.gentoo.org/783192
+	"${FILESDIR}"/${P}-arlocal.patch
+)
+
+src_prepare() {
+	# spice accepts -O1 at most
+	replace-flags -O* -O1
+
+	# Avoid re-creating WORKDIR due to stupid mtime
+	touch ..
+
+	sed -i -e "s/termcap/ncurses/g" \
+		-e "s/joe/\/usr\/libexec\/editor/g" \
+		-e "s/-O2 -s/${CFLAGS}/g" \
+		-e "s/-lncurses -lm -s/-lncurses -lm ${LDFLAGS}/" \
+		-e "s/SPICE_DIR)\/lib/SPICE_DIR)\/$(get_libdir)\/spice/g" \
+		-e "s/\/usr\/local\/spice/\/usr/g" \
+		-e "s/\/X11R6//" \
+		conf/linux || die
+	sed -i -e "s/head -1/head -n 1/" util/build || die
+
+	# fix possible buffer overflow (bug #339539)
+	sed -i -e "s/fgets(buf, BSIZE_SP/fgets(buf, sizeof(buf)/g" \
+		src/lib/fte/misccoms.c || die
+
+	# fix missing libtinfo if ncurses compiled with USE=tinfo (bug #605718)
+	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/g" conf/linux || die
+
+	default
+}
+
+src_compile() {
+	./util/build linux || die "build failed"
+	obj/bin/makeidx lib/helpdir/spice.txt || die "makeidx failed"
+}
+
+src_install() {
+	# install binaries
+	dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod}
+	newbin obj/bin/help spice.help
+	dosym spice3 /usr/bin/spice
+	# install runtime stuff
+	rm lib/make* || die
+	dodir /usr/$(get_libdir)/spice
+	cp -R lib/* "${ED}"/usr/$(get_libdir)/spice/ || die "failed to copy libraries"
+	# install docs
+	doman man/man1/*.1
+	dodoc readme readme.Linux notes/spice2
+}