3 files changed, 22 insertions, 28 deletions
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"