gentoo resync : 25.11.2020

5 files changed, 20 insertions, 110 deletions

diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index 6999189bf3be..4b6dfab99fb8 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -2,8 +2,8 @@ AUX iverilog-10.3-file-missing.patch 8849 BLAKE2B 2cb72c6d2b769ae0ac601f950b62dd
 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
 DIST iverilog-10.3.tar.gz 1600835 BLAKE2B 107c57c61fb27c18f4020f7853bf6ca83d1a86fdc73c57ea207828baf6b7a26d42e43ce7b33580f050a4c0b8f63bca6accecf678323a3bbbee1eb9c1d8fa2caa SHA512 67076e19a208576c21a0462ff7d15d00a9d47740c47518a5523bd928b3118360d85eb84c317963717d15e5246ece3727259f6ff3baf59e195340530cc9086a1d
-EBUILD iverilog-10.3-r1.ebuild 1869 BLAKE2B bda326a2afc4ba27c3fb0331033e3f229f323bb0ae7c73f47c9c00363b18c4c16a9ea942d5c7879c8e22f6bd9b86dc7c37370d384ab31d21168d2128cde37caa SHA512 83a96e9ba2ea8cedb81d0cc2f62226afeacfa6c5104213ac040299161500955212b8f6c70f8d991eb478cdfc62779b3bf264704ab68bd26cbc735b7c35e27c13
-EBUILD iverilog-10.3-r2.ebuild 1787 BLAKE2B 1691ece5e455e1dfd053bb40318b8e6582f995e58c8a7b116fd37c6401bd5a0959c4190560b202bca722c89913b460ea1f0690b504646d249488ce2186aa3302 SHA512 970eb1c579e34da062bff435d426973a746ebc2e4e2f5b7ee9b2fb76a9d573d45ba2185f97b54d1ebf35c72b953bd7a7434a1a35af2a58e17dcc238c8445f9bb
-EBUILD iverilog-10.3.ebuild 1865 BLAKE2B f3d3828e9d6d5afd7457dbe620450713e7e8e32ed18ee41f36d07eb474bfd979dd5c27b71fdd3a9847cdcec03229586bfd14c170354905573293137ede1853f8 SHA512 4d6d589df25c6f1139f0f24d3d3074c9b7251972d38828d97989806d6f80784049b0b84eaa93f92f24ba3d60499fd612ba32d6443967a7154a197e4a933f3c2d
-EBUILD iverilog-9999.ebuild 1663 BLAKE2B 639e6e07077819b2f5520f506797c0b43c4bac854221a07b5449869b02a057923d87e6456e6da78059f4c7f76913890ebf5fc69e230dead65fab966686936ac3 SHA512 768983e921a914592b911e034d6c4e4f32a7cab80f00a2ae26041f6eb23a02a177cac4c6e75c75dc3ea1fbee0c9a9d97309afaecb8715ce56f7100a02c09c4f3
+DIST iverilog-11.0.tar.gz 1682457 BLAKE2B ba90574e1453a095143e76e5dc79bb2357a721fc62c24f0fb23d220458819cb3b8ea8494410ce956e68831b682b61f27f64e94e9c166a69e5f6d5d30a8269a11 SHA512 5d6a65e1c3b6b62e99af708cd5a259cc69c6b789dd6eff69e225903d9b8c115d9e5d6f7635b30c6558197cd0ee6fd8196a163fbd98956e24c211d97328b85056
+EBUILD iverilog-10.3-r2.ebuild 1785 BLAKE2B 058c19a7d97a4dd06ddae74f5f52d8455b967ca62897ce1306174de02068e20dae8b9fa886d6d9931c448fe38e4e9530d1aac761b1a656403084f0755106025f SHA512 89c9086635765151fbf23c2d1c11c5daca8100d9fef52db681f4124aca10f51cdd8a94885479f98dc541bea583357744952d8ee859c103fcbba48b517acb4442
+EBUILD iverilog-11.0.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941
+EBUILD iverilog-9999.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941
 MISC metadata.xml 904 BLAKE2B 92e78cfceee82ffb4feaee92810d496bf78c3321a81c97fbcc0038244e2ea58e87fec57254ebd90852a4d308bd08d944659ce59b339b2762ba26843c8ad59cb3 SHA512 8c3633d7bea101dc771c26355b40d309eb5b0b3ea7bbf3538faaa9c7098253eb623aac3f9e312aed25a9262116d013784adf02d9f2a3943a5fbec3733dab250f
diff --git a/sci-electronics/iverilog/iverilog-10.3-r2.ebuild b/sci-electronics/iverilog/iverilog-10.3-r2.ebuild
index 5d2c037dbaa9..be0e76900950 100644
--- a/sci-electronics/iverilog/iverilog-10.3-r2.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3-r2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
 else
 	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 	S="${WORKDIR}/${PN}-${GITHUB_PV}"
 fi
 
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
deleted file mode 100644
index a2dea488d4fd..000000000000
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-GITHUB_PV=$(ver_rs 1- '_')
-
-DESCRIPTION="A Verilog simulation and synthesis tool"
-HOMEPAGE="
-	http://iverilog.icarus.com
-	https://github.com/steveicarus/iverilog
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
-else
-	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/${PN}-${GITHUB_PV}"
-fi
-
-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
-	sys-libs/zlib
-"
-
-DEPEND="
-	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
-)
-
-src_prepare() {
-	default
-
-	# From upstreams autoconf.sh, to make it utilize the autotools eclass
-	# Here translate the autoconf.sh, equivalent to the following code
-	# > sh autoconf.sh
-
-	# Autoconf in root ...
-	eautoconf --force
-	# Precompiling lexor_keyword.gperf
-	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
-	# Precompiling vhdlpp/lexor_keyword.gperf
-	cd vhdlpp || die
-	gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
-}
-
-src_install() {
-	local DOCS=( *.txt )
-	# Default build fails with parallel jobs,
-	# https://github.com/steveicarus/iverilog/pull/294
-	emake installdirs DESTDIR="${D}"
-	default
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-electronics/iverilog/iverilog-10.3-r1.ebuild b/sci-electronics/iverilog/iverilog-11.0.ebuild
index 8a107b99189d..de6fe18b47c9 100644
--- a/sci-electronics/iverilog/iverilog-10.3-r1.ebuild
+++ b/sci-electronics/iverilog/iverilog-11.0.ebuild
@@ -24,27 +24,18 @@ fi
 
 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="
+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
-)
-
 src_prepare() {
 	default
 
@@ -53,7 +44,8 @@ src_prepare() {
 	# > sh autoconf.sh
 
 	# Autoconf in root ...
-	eautoconf --force
+	eautoconf
+
 	# Precompiling lexor_keyword.gperf
 	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
 	# Precompiling vhdlpp/lexor_keyword.gperf
@@ -63,13 +55,9 @@ src_prepare() {
 
 src_install() {
 	local DOCS=( *.txt )
-	# Default build fails with parallel jobs,
-	# https://github.com/steveicarus/iverilog/pull/294
-	emake installdirs DESTDIR="${D}"
+
 	default
 
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/sci-electronics/iverilog/iverilog-9999.ebuild b/sci-electronics/iverilog/iverilog-9999.ebuild
index eb85629d9e8e..de6fe18b47c9 100644
--- a/sci-electronics/iverilog/iverilog-9999.ebuild
+++ b/sci-electronics/iverilog/iverilog-9999.ebuild
@@ -24,14 +24,14 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="examples"
 
 DEPEND="
 	sys-libs/readline:=
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}"
-BDEPEND="dev-util/gperf
+BDEPEND="
+	dev-util/gperf
 	sys-devel/bison
 	sys-devel/flex
 "
@@ -44,7 +44,8 @@ src_prepare() {
 	# > sh autoconf.sh
 
 	# Autoconf in root ...
-	eautoconf --force
+	eautoconf
+
 	# Precompiling lexor_keyword.gperf
 	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
 	# Precompiling vhdlpp/lexor_keyword.gperf
@@ -54,13 +55,9 @@ src_prepare() {
 
 src_install() {
 	local DOCS=( *.txt )
-	# Default build fails with parallel jobs,
-	# https://github.com/steveicarus/iverilog/pull/294
-	emake installdirs DESTDIR="${D}"
+
 	default
 
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }