gentoo resync : 12.05.2022

6 files changed, 207 insertions, 10 deletions

diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index f904d836c564..20519233773f 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -1,9 +1,13 @@
+AUX iverilog-10.3-call-nm.patch 2782 BLAKE2B b615d7382efd9afa136140e0099f9d281a1be5d36ab0a4c67a07c5c20dde2470365ab5c28caefefc9b5fc4da771da03a6557e5126ac1b4c54a9e0b29b9d668b6 SHA512 0dc9aabf82354e8e8a1dd503a366bb08a5aae81a38d8bdfbd108ba7532d359bbecd1372c0dd226982bfa0168bf5a6b122d21a0511c8c3ea4f4bfc298b0dc14e4
+AUX iverilog-10.3-configure-ac.patch 422 BLAKE2B 4f5bcc9b5d6cb1a3a0ef9a9af6d26fb0d5538413b2ed24b569e02374acfa19c7aca2b0080351a679428986304e702ffdbb3dc6cb1e6cfbe8d484c853ff8655c3 SHA512 d298dfe6eab1f988b7674adae3681ed172a8097137c470fb8410d1566a04e79f8884b938741415d8f72bc7a9ecd26bcb09e47f0efdf14c68d8a95aadc9e763f9
 AUX iverilog-10.3-file-missing.patch 8849 BLAKE2B 2cb72c6d2b769ae0ac601f950b62dd0c3ad460df593a6a033794a5bfa482d1aa18e74502a8f54456c96df86ba12fe61827e0439764d05e0b5d5b00ae1d71d870 SHA512 bb954e9669fdfaea30a9bf711a2d7b5cf38906dc3665752746a9e0d8738dc07a79d90b33ba82dfe665a8181910b3b3083a78d06607562d684f6d9b8bc1741368
 AUX iverilog-10.3-fno-common.patch 777 BLAKE2B 99ce15739f0d86dd838e652542152cc7b2301a3dee605b7aff299ef3588576b21ed21ae19468a3dcca200cee4b6cd3271125837d75e83dbed770d07cd2eeb83a SHA512 2e10fbb03649da90e97977b18922fb74527d0256fdd6b819ba69cafe64c3a38f09cf47619448fd34a47a2ebf72af406c18d276885189f2381157ba99c1994319
+AUX iverilog-10.3-gen-bison-header.patch 3125 BLAKE2B 75bd40007237491571e0bbac19cd9d007db5b18b491882f52ca9889ead097189371906a62cebae2176ea822572984f58c97ac6abbef7ee89f2397a06a4580c1f SHA512 ebc835c28456498787a82ff446c606a6713343e4421465a17afeb1266b1dc445c760707059b217ee9efc7e79d00a119fb2173c1adbf3270cdd0ed720e3436d17
+AUX iverilog-10.3-override-var.patch 337 BLAKE2B c1809c3dc2cf47f349afb851d11d4ac85e57edbe1f93276b5505ac33f372026421c288c70ee3bc0019784ac0d7c06c134e52a08e8be23f572c0a292b68a343d5 SHA512 3637d9b85cc054b75ef7bd2994a9947b6a37d24eee79f9830a6df9f1f01a8e97041753b9759f2c17f844d160c0bc3d70ad173b499b8d5ad4a4de57c0145a2a6d
 AUX iverilog-11.0-autoconf-2.70.patch 11616 BLAKE2B f753698b8dfc21914ac68d09251515f71890e5164252173b020987b1387cccc23ac9d621cb27b5073d654f87cf003a75b9a35d075437201b565f32220e14fc18 SHA512 1a57dfd29799ff2aeeb27632325b9522b9764faaecf223ff7120bf224ebae8cda2beffb5f2b04bfc148e518332680272cc32491e0bcd103c2d0dffd46a37aa0e
 DIST iverilog-10.3.tar.gz 1600835 BLAKE2B 107c57c61fb27c18f4020f7853bf6ca83d1a86fdc73c57ea207828baf6b7a26d42e43ce7b33580f050a4c0b8f63bca6accecf678323a3bbbee1eb9c1d8fa2caa SHA512 67076e19a208576c21a0462ff7d15d00a9d47740c47518a5523bd928b3118360d85eb84c317963717d15e5246ece3727259f6ff3baf59e195340530cc9086a1d
 DIST iverilog-11.0.tar.gz 1682457 BLAKE2B ba90574e1453a095143e76e5dc79bb2357a721fc62c24f0fb23d220458819cb3b8ea8494410ce956e68831b682b61f27f64e94e9c166a69e5f6d5d30a8269a11 SHA512 5d6a65e1c3b6b62e99af708cd5a259cc69c6b789dd6eff69e225903d9b8c115d9e5d6f7635b30c6558197cd0ee6fd8196a163fbd98956e24c211d97328b85056
-EBUILD iverilog-10.3.ebuild 1866 BLAKE2B f07289f5dec09316e33c00abda459945eb01ed73a0572a34d836fd4cff683c1c95bf8b0c92ccd2d44380ede38567666a4a3e292c2adf0c2b4378339153c27276 SHA512 df78880a41a206e3bdd2934e1b14afb9763c5b445a13e5dee5e3bc0bc34fffeda6fd4c7c7d1085d4d4d014978eaa8a1a2910f1cdda256f2d1e1874051c3b9d37
+EBUILD iverilog-10.3.ebuild 2126 BLAKE2B 9336f71dd709a922c6b20b8523d2c0bcef3decff9fa186b5d01993e411de497136212496a848aa8b732bb46d2aff8f230825014d2b2723c833b5c1c02dfdd1d7 SHA512 31ba90af04135da16bb2b6c6f239a0105b213849fc7bfe68ff73580683d95d03e50c5e018399a639d21c3010f89548c5553e0fd20aecc6da0dfca07d3ef317e2
 EBUILD iverilog-11.0.ebuild 1543 BLAKE2B 68cf06b5f5d87fed8fcdf90a318ec6cc7aa8c4075340fe275506ce694f3aa05e9a5d621ddfe7122a20aeb6574c55120c96edfbb75e6653cb8292dd08b488c76e SHA512 b9b992193f1e1a5381a13238cf6bc69c0132d18f637f6abde44be10696b2c4aa38219d07f1ad730deb1b24d75beef27bb2da80b5fca3e4c8230ebbee323d2f2c
 EBUILD iverilog-9999.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941
 MISC metadata.xml 935 BLAKE2B 43c8165799b301c14618858df3e2591578aa4b5605e3ce0ca08a15337b6a53376863db9c07451d4fd5849d71fb2335bbefc9f2848b257079c2fe5b7d731361a2 SHA512 2508fb58d82acf9f8784197a03874cc73cc99b46c3d41dce2f2aee6e75a9a107bcd66530c942cf2d329fd31e48ce670764cd3042f8e6af2027e4c4e1fdaad2ef
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch b/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch
new file mode 100644
index 000000000000..2261a6ada4cf
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch
@@ -0,0 +1,67 @@
+From f3396d502d408c1b349c378060027905a2c2a9c3 Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+Date: Sat, 25 Jul 2020 12:50:49 +0800
+Subject: [PATCH 1/2] aclocal.m4: fix issue in cross-compiling
+
+The aclocal.m4 called nm directly.
+It can cause issue in cross-compiling and because is not possible
+use a different NM implementation (like llvm-nm).
+The compile error log:
+https://bugs.gentoo.org/attachment.cgi?id=648556
+
+Closes: https://bugs.gentoo.org/731906
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ aclocal.m4 | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index a47eba42c..16ef69c85 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -25,9 +25,11 @@ AC_SUBST(install_suffix)
+ # Unwarranted assumptions:
+ #   - the object file produced by AC_COMPILE_IFELSE is called "conftest.$ac_objext"
+ #   - the nm(1) utility is available, and its name is "nm".
++# Here use $NM because they can cause issue in cross-compiling and because is
++# not possible use a different NM implementation (like llvm-nm)
+ AC_DEFUN([_AX_C_UNDERSCORES_MATCH_IF],
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([void underscore(void){}])],
+-[AS_IF([nm conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
++[AS_IF([$NM conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
+ [AC_MSG_ERROR([underscore test crashed])]
+ )])
+ 
+
+From d827f674cc0a37d8150c18df6112a0a895f2a584 Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+Date: Tue, 28 Jul 2020 21:15:49 +0800
+Subject: [PATCH 2/2] aclocal.m4: fix the comment contradicts the previous line
+
+Changed to "the nm(1) utility or an equivalent is available,
+and its name is defined by the $NM variable.
+
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ aclocal.m4 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 16ef69c85..1b2dd6a1e 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -23,10 +23,10 @@ AC_SUBST(install_suffix)
+ # ------------------------------
+ # Sub-macro for AX_C_UNDERSCORES_LEADING and AX_C_UNDERSCORES_TRAILING.
+ # Unwarranted assumptions:
+-#   - the object file produced by AC_COMPILE_IFELSE is called "conftest.$ac_objext"
+-#   - the nm(1) utility is available, and its name is "nm".
+-# Here use $NM because they can cause issue in cross-compiling and because is
+-# not possible use a different NM implementation (like llvm-nm)
++#   - the object file produced by AC_COMPILE_IFELSE is called
++#     "conftest.$ac_objext"
++#   - the nm(1) utility or an equivalent is available, and its name
++#     is defined by the $NM variable.
+ AC_DEFUN([_AX_C_UNDERSCORES_MATCH_IF],
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([void underscore(void){}])],
+ [AS_IF([$NM conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch b/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch
new file mode 100644
index 000000000000..b7a81d1facaa
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/426262
+--- a/Makefile.in	2022-04-25 18:06:16.529673077 +0800
++++ b/Makefile.in	2022-04-25 18:13:12.134356482 +0800
+@@ -200,7 +200,7 @@
+ 	./config.status _pli_types.h
+ _pli_types.h: stamp-_pli_types-h
+ 
+-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
++$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+ 	cd $(srcdir) && autoconf
+ 
+ config.status: $(srcdir)/configure
\ No newline at end of file
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch b/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch
new file mode 100644
index 000000000000..0027184c8338
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch
@@ -0,0 +1,97 @@
+From 5b699c1be73e789831db01e779a41478c0c62309 Mon Sep 17 00:00:00 2001
+From: Henner Zeller <h.zeller@acm.org>
+Date: Wed, 29 Jul 2020 15:29:08 -0700
+Subject: [PATCH] Bison includes its generated header in *.cc. Generate with
+ correct name.
+
+The current bison (3.7) generates a *.cc file that includes the header
+it generated. For parse.cc this would be parse.hh. Right now, we rename
+this header to have a common name used in other files, but this results
+in a compile error for the parse.cc file:
+
+parse.cc:462:10: fatal error: parse.hh: No such file or directory
+  462 | #include "parse.hh"
+      |          ^~~~~~~~~~
+
+Fix this by telling bison to output the header file to the correct
+filename in the first place so that we don't have to rename it.
+(using the --defines instead of -d option).
+
+This looks like a bison specific option not available in Posix yacc;
+but looks like we're requiring bison anyway.
+
+Signed-off-by: Henner Zeller <h.zeller@acm.org>
+---
+ Makefile.in         | 4 +---
+ tgt-pcb/Makefile.in | 4 +---
+ vhdlpp/Makefile.in  | 4 +---
+ vvp/Makefile.in     | 4 +---
+ 4 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5ac5515a..cc8cac46 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -256,10 +256,8 @@ parse.o: parse.cc
+ 
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+-	$(YACC) --verbose -t -p VL -d -o $@ $<
++	$(YACC) --verbose -t -p VL --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+-	mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+-	touch $@
+ 
+ syn-rules.cc: $(srcdir)/syn-rules.y
+ 	$(YACC) --verbose -t -p syn_ -o $@ $<
+diff --git a/tgt-pcb/Makefile.in b/tgt-pcb/Makefile.in
+index a5f9b7d5..7345e195 100644
+--- a/tgt-pcb/Makefile.in
++++ b/tgt-pcb/Makefile.in
+@@ -89,10 +89,8 @@ fp_lex.cc: $(srcdir)/fp.lex
+ 	$(LEX) -s -ofp_lex.cc $(srcdir)/fp.lex
+ 
+ fp.cc: $(srcdir)/fp.y
+-	$(YACC) --verbose -t -p fp -d -o $@ $<
++	$(YACC) --verbose -t -p fp --defines=fp.h -o $@ $<
+ fp.h: fp.cc
+-	mv fp.cc.h $@ 2>/dev/null || mv fp.hh $@
+-	touch $@
+ 
+ ifeq (@WIN32@,yes)
+   TGTLDFLAGS=-L.. -livl
+diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in
+index 53ae140a..458178bd 100644
+--- a/vhdlpp/Makefile.in
++++ b/vhdlpp/Makefile.in
+@@ -117,10 +117,8 @@ lexor.cc: $(srcdir)/lexor.lex
+ 
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+-	$(YACC) --verbose -t -d -o $@ $<
++	$(YACC) --verbose -t --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+-	mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+-	touch $@
+ 
+ lexor_keyword.o: lexor_keyword.cc parse.h
+ 
+diff --git a/vvp/Makefile.in b/vvp/Makefile.in
+index 8ccdb1d2..cdd940f5 100644
+--- a/vvp/Makefile.in
++++ b/vvp/Makefile.in
+@@ -142,10 +142,8 @@ tables.o: tables.cc
+ 
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+-	$(YACC) --verbose -t -d -o $@ $<
++	$(YACC) --verbose -t --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+-	mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+-	touch $@
+ 
+ lexor.cc: $(srcdir)/lexor.lex
+ 	$(LEX) -s -olexor.cc $(srcdir)/lexor.lex
+-- 
+2.26.2
+
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-override-var.patch b/sci-electronics/iverilog/files/iverilog-10.3-override-var.patch
new file mode 100644
index 000000000000..93b9a616987d
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-override-var.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/730096
+--- a/vpi/Makefile.in	2022-04-25 18:39:03.748939186 +0800
++++ b/vpi/Makefile.in	2022-04-25 18:38:43.754679053 +0800
+@@ -71,7 +71,7 @@
+ M = sys_clog2.o v2005_math.o
+ 
+ # Object files for va_math.vpi
+-V = va_math.o
++override V = va_math.o
+ 
+ V2009 = v2009_table.o v2009_array.o v2009_enum.o v2009_string.o
+ 
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index 1a2a537efa44..a0e95ea74ac9 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -26,23 +26,25 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="examples"
 
-# If you are building from git, you will also need gperf to generate
-# the configure scripts.
-RDEPEND="
-	sys-libs/readline:0
+# 721022, should depend on sys-libs/readline:=
+DEPEND="
+	sys-libs/readline:=
 	sys-libs/zlib
 "
-
-DEPEND="
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-util/gperf
 	sys-devel/bison
 	sys-devel/flex
-	${RDEPEND}
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3-file-missing.patch #705412
 	"${FILESDIR}"/${PN}-10.3-fno-common.patch #706366
+	"${FILESDIR}"/${PN}-10.3-gen-bison-header.patch #734760
+	"${FILESDIR}"/${PN}-10.3-call-nm.patch #731906
+	"${FILESDIR}"/${PN}-10.3-configure-ac.patch #426262
+	"${FILESDIR}"/${PN}-10.3-override-var.patch #730096
 )
 
 src_prepare() {
@@ -52,6 +54,9 @@ src_prepare() {
 	# Here translate the autoconf.sh, equivalent to the following code
 	# > sh autoconf.sh
 
+	# Move configure.in to configure.ac (bug #426262)
+	mv configure.in configure.ac || die
+
 	# Autoconf in root ...
 	eautoconf --force
 	# Precompiling lexor_keyword.gperf