4 files changed, 25 insertions, 31 deletions
diff --git a/sci-electronics/irsim/Manifest b/sci-electronics/irsim/Manifest
index f56f3f313689..d2ce35abb0f6 100644
--- a/sci-electronics/irsim/Manifest
+++ b/sci-electronics/irsim/Manifest
@@ -1,5 +1,5 @@
-AUX irsim-9.7.72-ldflags.patch 1855 BLAKE2B cb99e706e01c41d35d3e02f7f946d206bee2197738ab8be75e414059625118dbeb5e7949a30302773495005beff58b1d35c16325437817b17c93dfb4240ae197 SHA512 8ead19ef40e93353d158c8bd5794b1e71278d49386e1f7becbe0f33ffb31ca91906fd7c967fd77b8735d25ab723dbe52ec81931d751380908969a0517ca9637b
-AUX irsim-9.7.79-datadir.patch 757 BLAKE2B d00b871b4f6d2c6a0f99e3d9e80d8ad11bc61973e05d287f69b1bc7ec9dac305741e5058fe7e0a1914def1740703a4aaa92e5d60308a967effa1a4b98653fdae SHA512 28104437434073079b875e4590bd1aaeff8246a785460e136327c8e428f5d13826cd586d9b69b41e1138f2d7357c0b9d8fc56784347e98117e1838bd8a6aa94e
+AUX irsim-9.7.72-ldflags.patch 1567 BLAKE2B f9045d363b3f7f25a7d03039f01343745402dcb1652583060448d8cc1db89d242d763c1cd3c9aa18882634ebf9f3cb03c9505f7648e15145902da9ff53bf678d SHA512 1a19a2c5aa951396b79b657fa45d8ec2787d47aab31b62b699693029475a4444bbbf5a57c687dd2becb9d89c73e9446822a4d57984c59fa09dcc526bc84532b5
+AUX irsim-9.7.79-datadir.patch 735 BLAKE2B 31e0b55f97f36d5b65965e67ce6e7879148e3f620c838c00c370d6229beb705c2040507dd741c8aac6051ff8d9e4a1634641a19e6292594f6f1dc667553e52aa SHA512 0bd832b47d47898bd167f2ae309892fe6ab55bb5dd60321c1bf3861d1ffcbf7f72d49d9f291693de8ca0558b5df6f725d671393870c33697f03e36256fbc40a6
 DIST irsim-9.7.93.tgz 465721 BLAKE2B f40e1216f51a51a38ee52628532989ee307db1ff3b0daa4f047a1a3eb04bd49d903382f67c1c4bae4366147f4448eb9699cdc47cffe712fa70a9d34c5bf13d00 SHA512 441a803935c178bdd663360df058142c07d91aecd158d6be8f10b670fc2a295e79839914de6a85ced58a79591625c514e2ceabe87486092d8a1784c7e47a02b3
-EBUILD irsim-9.7.93.ebuild 1083 BLAKE2B 1e27d80b5d881581f3b3693499e687aa23d1e6b469c03573936640162bf9afc52d53bb0a12b2b72179a44eabc66cd059a301a94145874ac87ded422b3ac237e8 SHA512 b1a6798848cae5bb938aee5e011730eb2c72a7db4ab82c2cfd8bf5b672b4ba56f24dee33cc254fd656013b6175e9c2c3b2d4eaaa708d616778f758b742cf56e1
+EBUILD irsim-9.7.93.ebuild 958 BLAKE2B 3528559abf9b9f366eaa1c960f4dc5640c3d19e9e8c76f209866f8a58b682c45946a03f6908d2d43114247f2ad739d9d737d4df27e1ea3b8e07dd871b97fb330 SHA512 a9527de34b8f2e5c76d66d02e3c61d8ce51c4504dbc5cac1a34d21bf649f59276faaed9ada9ff8ef2ace014852ebf8a71b9b8c8cf4bb20c4360177bd4b9cd7b2
 MISC metadata.xml 644 BLAKE2B de25bee0f8d6f5186f163c94504e8693ffab983b8a7957945f11086c5d9be2c8b054c7b212cc289852aa603d7702b39f98f4e348212171a0e3bbb0e269fd298c SHA512 3251cd8e81a1ff0d440718fd39a6f8cd8334ed71f04c44235a8946388e3ead12b879bd1bb964688749291e5146082b4c51bd570efafc271516e72eb28a85e414
diff --git a/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch b/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
index d219415eb5e8..8c50e2ea2b17 100644
--- a/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
+++ b/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch
@@ -1,5 +1,5 @@
---- tcltk/Makefile.old	2011-04-26 17:40:36.000000000 +0000
-+++ tcltk/Makefile	2011-04-26 17:41:05.000000000 +0000
+--- a/tcltk/Makefile
++++ b/tcltk/Makefile
 @@ -26,7 +26,7 @@
  	${CP} irsimexec $(DESTDIR)${TCLDIR}/irsimexec
  
@@ -9,8 +9,8 @@
  		${LIBS} ${LIB_SPECS}
  
  irsim.tcl: irsim.tcl.in
---- irsim/Makefile.old	2011-04-26 17:46:38.000000000 +0000
-+++ irsim/Makefile	2011-04-26 17:47:21.000000000 +0000
+--- a/irsim/Makefile
++++ b/irsim/Makefile
 @@ -22,7 +22,7 @@
  tclirsim${SHDLIB_EXT}: ${EXTRA_LIBS}
  	@echo --- making irsim Tcl library \(tclirsim${SHDLIB_EXT}\)
@@ -20,8 +20,8 @@
  		${EXTRA_LIBS} -lc ${LIBS} ${LD_EXTRA_LIBS}
  
  $(DESTDIR)${BINDIR}/irsim:
---- random/Makefile.old	2011-04-26 17:48:46.000000000 +0000
-+++ random/Makefile	2011-04-26 17:49:02.000000000 +0000
+--- a/random/Makefile
++++ b/random/Makefile
 @@ -21,7 +21,7 @@
  random${SHDLIB_EXT}: randwrap.o
  	@echo --- making random Tcl library
@@ -31,8 +31,8 @@
  		${MAC_SHARED} -lc ${LIBS} ${LD_EXTRA_LIBS}
  
  install-tcl: $(DESTDIR)${TCLDIR}/random${SHDLIB_EXT}
---- tclsubckt/Makefile.old	2011-04-26 17:50:23.000000000 +0000
-+++ tclsubckt/Makefile	2011-04-26 17:50:45.000000000 +0000
+--- a/tclsubckt/Makefile
++++ b/tclsubckt/Makefile
 @@ -22,7 +22,7 @@
  diglib${SHDLIB_EXT}: diglib.o
  	@echo --- making diglib subcircuit shared library
diff --git a/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch b/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
index ca4fd4628575..12ee3ba00964 100644
--- a/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
+++ b/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch
@@ -1,5 +1,5 @@
---- irsim-9.7.79/scripts/defs.mak.in
-+++ irsim-9.7.79/scripts/defs.mak.in
+--- a/scripts/defs.mak.in
++++ b/scripts/defs.mak.in
 @@ -12,6 +12,7 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
diff --git a/sci-electronics/irsim/irsim-9.7.93.ebuild b/sci-electronics/irsim/irsim-9.7.93.ebuild
index 967389cbcee7..c2ea4a864883 100644
--- a/sci-electronics/irsim/irsim-9.7.93.ebuild
+++ b/sci-electronics/irsim/irsim-9.7.93.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit epatch multilib
+EAPI=8
 
 DESCRIPTION="IRSIM is a \"switch-level\" simulator"
 HOMEPAGE="http://opencircuitdesign.com/irsim/"
@@ -12,29 +10,25 @@ SRC_URI="http://opencircuitdesign.com/irsim/archive/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-lang/tcl:0
-	dev-lang/tk:0"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
+RDEPEND="
+	dev-lang/tcl:=
+	dev-lang/tk:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-shells/tcsh"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9.7.72-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-9.7.79-datadir.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.7.72-ldflags.patch
+	"${FILESDIR}"/${PN}-9.7.79-datadir.patch
+)
 
 src_configure() {
 	# Short-circuit top-level configure script to retain CFLAGS
-	cd scripts
+	cd scripts || die
 	econf
 }
 
-src_install() {
-	emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
-	dodoc README
-}
-
 pkg_postinst() {
 	einfo
 	einfo "You will probably need to add to your ~/.Xdefaults"