1 |
commit: 76ee3a6af1b260deb50655ce6e62c5ef8f308dbd |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Sun Aug 22 19:37:21 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 22 19:37:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ee3a6a |
7 |
|
8 |
sci-electronics/irsim: Port to EAPI 8 |
9 |
|
10 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
.../irsim/files/irsim-9.7.72-ldflags.patch | 16 ++++++------ |
14 |
.../irsim/files/irsim-9.7.79-datadir.patch | 4 +-- |
15 |
sci-electronics/irsim/irsim-9.7.93.ebuild | 30 +++++++++------------- |
16 |
3 files changed, 22 insertions(+), 28 deletions(-) |
17 |
|
18 |
diff --git a/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch b/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch |
19 |
index d219415eb5e..8c50e2ea2b1 100644 |
20 |
--- a/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch |
21 |
+++ b/sci-electronics/irsim/files/irsim-9.7.72-ldflags.patch |
22 |
@@ -1,5 +1,5 @@ |
23 |
---- tcltk/Makefile.old 2011-04-26 17:40:36.000000000 +0000 |
24 |
-+++ tcltk/Makefile 2011-04-26 17:41:05.000000000 +0000 |
25 |
+--- a/tcltk/Makefile |
26 |
++++ b/tcltk/Makefile |
27 |
@@ -26,7 +26,7 @@ |
28 |
${CP} irsimexec $(DESTDIR)${TCLDIR}/irsimexec |
29 |
|
30 |
@@ -9,8 +9,8 @@ |
31 |
${LIBS} ${LIB_SPECS} |
32 |
|
33 |
irsim.tcl: irsim.tcl.in |
34 |
---- irsim/Makefile.old 2011-04-26 17:46:38.000000000 +0000 |
35 |
-+++ irsim/Makefile 2011-04-26 17:47:21.000000000 +0000 |
36 |
+--- a/irsim/Makefile |
37 |
++++ b/irsim/Makefile |
38 |
@@ -22,7 +22,7 @@ |
39 |
tclirsim${SHDLIB_EXT}: ${EXTRA_LIBS} |
40 |
@echo --- making irsim Tcl library \(tclirsim${SHDLIB_EXT}\) |
41 |
@@ -20,8 +20,8 @@ |
42 |
${EXTRA_LIBS} -lc ${LIBS} ${LD_EXTRA_LIBS} |
43 |
|
44 |
$(DESTDIR)${BINDIR}/irsim: |
45 |
---- random/Makefile.old 2011-04-26 17:48:46.000000000 +0000 |
46 |
-+++ random/Makefile 2011-04-26 17:49:02.000000000 +0000 |
47 |
+--- a/random/Makefile |
48 |
++++ b/random/Makefile |
49 |
@@ -21,7 +21,7 @@ |
50 |
random${SHDLIB_EXT}: randwrap.o |
51 |
@echo --- making random Tcl library |
52 |
@@ -31,8 +31,8 @@ |
53 |
${MAC_SHARED} -lc ${LIBS} ${LD_EXTRA_LIBS} |
54 |
|
55 |
install-tcl: $(DESTDIR)${TCLDIR}/random${SHDLIB_EXT} |
56 |
---- tclsubckt/Makefile.old 2011-04-26 17:50:23.000000000 +0000 |
57 |
-+++ tclsubckt/Makefile 2011-04-26 17:50:45.000000000 +0000 |
58 |
+--- a/tclsubckt/Makefile |
59 |
++++ b/tclsubckt/Makefile |
60 |
@@ -22,7 +22,7 @@ |
61 |
diglib${SHDLIB_EXT}: diglib.o |
62 |
@echo --- making diglib subcircuit shared library |
63 |
|
64 |
diff --git a/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch b/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch |
65 |
index ca4fd462857..12ee3ba0096 100644 |
66 |
--- a/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch |
67 |
+++ b/sci-electronics/irsim/files/irsim-9.7.79-datadir.patch |
68 |
@@ -1,5 +1,5 @@ |
69 |
---- irsim-9.7.79/scripts/defs.mak.in |
70 |
-+++ irsim-9.7.79/scripts/defs.mak.in |
71 |
+--- a/scripts/defs.mak.in |
72 |
++++ b/scripts/defs.mak.in |
73 |
@@ -12,6 +12,7 @@ |
74 |
exec_prefix = @exec_prefix@ |
75 |
bindir = @bindir@ |
76 |
|
77 |
diff --git a/sci-electronics/irsim/irsim-9.7.93.ebuild b/sci-electronics/irsim/irsim-9.7.93.ebuild |
78 |
index 967389cbcee..c2ea4a86488 100644 |
79 |
--- a/sci-electronics/irsim/irsim-9.7.93.ebuild |
80 |
+++ b/sci-electronics/irsim/irsim-9.7.93.ebuild |
81 |
@@ -1,9 +1,7 @@ |
82 |
# Copyright 1999-2021 Gentoo Authors |
83 |
# Distributed under the terms of the GNU General Public License v2 |
84 |
|
85 |
-EAPI=5 |
86 |
- |
87 |
-inherit epatch multilib |
88 |
+EAPI=8 |
89 |
|
90 |
DESCRIPTION="IRSIM is a \"switch-level\" simulator" |
91 |
HOMEPAGE="http://opencircuitdesign.com/irsim/" |
92 |
@@ -12,29 +10,25 @@ SRC_URI="http://opencircuitdesign.com/irsim/archive/${P}.tgz" |
93 |
LICENSE="GPL-2" |
94 |
SLOT="0" |
95 |
KEYWORDS="~amd64 ~x86" |
96 |
-IUSE="" |
97 |
|
98 |
-RDEPEND="dev-lang/tcl:0 |
99 |
- dev-lang/tk:0" |
100 |
-DEPEND="${RDEPEND} |
101 |
- app-shells/tcsh" |
102 |
+RDEPEND=" |
103 |
+ dev-lang/tcl:= |
104 |
+ dev-lang/tk:= |
105 |
+" |
106 |
+DEPEND="${RDEPEND}" |
107 |
+BDEPEND="app-shells/tcsh" |
108 |
|
109 |
-src_prepare() { |
110 |
- epatch "${FILESDIR}"/${PN}-9.7.72-ldflags.patch |
111 |
- epatch "${FILESDIR}"/${PN}-9.7.79-datadir.patch |
112 |
-} |
113 |
+PATCHES=( |
114 |
+ "${FILESDIR}"/${PN}-9.7.72-ldflags.patch |
115 |
+ "${FILESDIR}"/${PN}-9.7.79-datadir.patch |
116 |
+) |
117 |
|
118 |
src_configure() { |
119 |
# Short-circuit top-level configure script to retain CFLAGS |
120 |
- cd scripts |
121 |
+ cd scripts || die |
122 |
econf |
123 |
} |
124 |
|
125 |
-src_install() { |
126 |
- emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install |
127 |
- dodoc README |
128 |
-} |
129 |
- |
130 |
pkg_postinst() { |
131 |
einfo |
132 |
einfo "You will probably need to add to your ~/.Xdefaults" |