gentoo resync : 10.11.2019

7 files changed, 207 insertions, 5 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 227728e68394..620eaaf4399d 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index dddadc3a5a70..d2d9e5aef9c2 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -4,6 +4,9 @@ AUX ngspice-27-fix_parsing_tcl_commands.patch 448 BLAKE2B d5d3532bca4301aa4c2811
 AUX ngspice-27-split_terminfo.patch 1081 BLAKE2B 8e44c6fe8447b419986206cc658a255e3c574d81cbbb3079d00f08046978f7a08c8c3e9697fdbf009aa1840df60d0045bd6712351280977cf8e66e3d2d505ab2 SHA512 2e5b7f83045304fbc5b35a9c7aeff3ed343b27d830e4d69bf5b30c631f59965241116afc5d062f3fb16b20710e42897605fc614fecb01997a92c595c47510f66
 DIST ngspice-27-manual.pdf 3117788 BLAKE2B 6e271abc50b0139c4776844ea31176d231e68c70ce34d0daec48aefc5ef5a9eac90a77f3141081f38c6ac8d42bb95ec061bf1d43bfd3a4fb13e4822c2eff4f57 SHA512 ed87764715917e2cd832c49e911a2908dba9907f9f01c933cb7f97a92c7f9ff345bc26a2f0561dd34b2eede6874b6a67b4864abf3dcff127bd0306e778e997b5
 DIST ngspice-27.tar.gz 7372998 BLAKE2B ce8590518fa4eb4292c73c4eaefdd9d0da19bca8120b51daae954a5b9d86f51912d2dccb5a827480caadce8321373d96f045226db4986a78bcc9170f2e46f9a5 SHA512 1714f95ab5716c228a0b39395a742e8b9a823e0e6f7e08625d089541ea786df5fd7b9d2982bcec8431e27ac6ba7603ecc507f9cfcb0a6aacd53f5633f52bd2ea
+DIST ngspice-31-manual.pdf 2149244 BLAKE2B 155f7299cbb6d7c7953d8488e11f0bffc3c18097f02194c491174a9af387cda9e87cb79b13a37f402616386e7e82230eb4d41909fe37d900792e48f2f49c71dd SHA512 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55
+DIST ngspice-31.tar.gz 7250057 BLAKE2B dabc8e1084eba957d6dad06e74f878b51e97dc8bc49b04ee612a6f9eaadde7302450c9ab93e943c4af42197b6bbdca7cae534464ccd2fcd4869b8a48b6f3140d SHA512 448024f398d267911d5d2a48da03eb0d87ba1133ce39d5132bd318dde8ad359d19c7f85f6b4ec88c08b081c9140f7b931334d84173019a22aa2ac98482bd7d5d
 EBUILD ngspice-27-r1.ebuild 4281 BLAKE2B def66993990b59da6920f3fafb4b55b0219308323ebc5d64398cd1ef149219dd54d77bcf8b7c60a4207d70e6e9a39c389877e72d49cda1663fd97e3e1d41d8f7 SHA512 568bc61f6770fde21b14ab3412afa9d8e1054fdb7b5794c0504fb7de3cddaa6ef190756c2944c50dc7ca7754d5bc2c81fb272a96b189b52b720dcf61b0e2838e
 EBUILD ngspice-27.ebuild 1828 BLAKE2B f7e886b443f1d58cce69434a5dd9dd87cbd67cd0d6432b99a7efd857f4f7feb36cec3f56502550227785cbffd51f11b819394d247fd4b45c7ed0862f1e5739c1 SHA512 e2fc30a6ce6ef0ecc83444f4e3a305826bdb7c3591984382e0f1cfd9469d5caf0771d4aacd8c8e0e35fff6eb06e3577c13e655692cf610c30586e02558b2292f
-MISC metadata.xml 613 BLAKE2B 658a1ccd1c1149c4b3626b482b1c80845502b80d0cd9316117f433edc4d2e5106ac92b97c3bebc23c43a82247592cc85068b08eea3caa859f976548f2a890a73 SHA512 791dc0311699db360c5e013f33786fb546119010cb8bbc36fc91ac6a522f1642f4297d8ffb945291ee20ce337647777d06e463083ac6ca0888d36ff0e1a71dcc
+EBUILD ngspice-31-r1.ebuild 4418 BLAKE2B 7279ba23e8e6e9c08c8ca27536e46858babc7296cd6c0c000148dafe7bce30a0e3d899f4b93caedac42dfa5d7c0bfedc0f01fba0e1ddae75a4d8295bbcd4707c SHA512 f48200b148d8d83301747a14a00a40fb2711aa65ed6130160650827488d3737b137c1ddce6a71d2d05db1c2b536262813c7b58826d5b50ece98b9bd13ec7c8b8
+MISC metadata.xml 676 BLAKE2B 9f7a12febdcf08bf12af50524f20250fdb253888ff12045d6033f957f9c6d81fd21ce47a1e6694d9aa48d28fa2b5f9e3cbabc8e54f4e810ea10e5f251ebf3165 SHA512 3a92c343662ecec1091a9bc8e5b4c9569c783e3ddd78027925487a93446d43c863f918de67a8738eea463994ba6c590e693245d36ed4e05e62312cf100a1f2a7
diff --git a/sci-electronics/ngspice/metadata.xml b/sci-electronics/ngspice/metadata.xml
index ed47ec5f1705..293e59a7c77f 100644
--- a/sci-electronics/ngspice/metadata.xml
+++ b/sci-electronics/ngspice/metadata.xml
@@ -10,6 +10,7 @@
 		three open source software packages: Spice3f5, Cider1b1 and Xspice.
 	</longdescription>
 	<use>
+		<flag name="deprecated">Build old and deprecated apps</flag>
 		<flag name="shared">Build ngspice as a shared library</flag>
 	</use>
 	<upstream>
diff --git a/sci-electronics/ngspice/ngspice-31-r1.ebuild b/sci-electronics/ngspice/ngspice-31-r1.ebuild
new file mode 100644
index 000000000000..e5e3414ba86b
--- /dev/null
+++ b/sci-electronics/ngspice/ngspice-31-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multibuild toolchain-funcs virtualx
+
+DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)"
+SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz
+	doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )"
+HOMEPAGE="http://ngspice.sourceforge.net"
+LICENSE="BSD GPL-2"
+
+SLOT="0"
+IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
+
+DEPEND="sys-libs/ncurses:0=
+	X? ( x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libX11 )
+	fftw? ( sci-libs/fftw:3.0 )
+	readline? ( sys-libs/readline:0= )
+	tcl? ( dev-lang/tcl:0
+		dev-tcltk/blt )"
+RDEPEND="${DEPEND}
+	X? ( sci-visualization/xgraph )"
+
+DOCS=(
+	ANALYSES
+	AUTHORS
+	BUGS
+	ChangeLog
+	DEVICES
+	FAQ
+	NEWS
+	README
+	README.vdmos
+	Stuarts_Poly_Notes
+)
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( "binaries" )
+	use shared && MULTIBUILD_VARIANTS+=( "shared" )
+	use tcl && MULTIBUILD_VARIANTS+=( "tcl" )
+	use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	if use tcl; then
+		if use examples; then
+			find examples/tclspice -type f -iname \*tcl -or -iname \*.sh |
+			while read s
+			do
+				sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \
+					-e 's@package require BLT@package require Tk\npackage require BLT@g' \
+					-e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \
+					"${s}" || die "sed failed"
+			done
+		fi
+	fi
+
+	eautoreconf
+	multibuild_copy_sources
+}
+
+src_configure() {
+	multibuild_foreach_variant ngspice_configure
+}
+
+ngspice_configure() {
+	local myeconfargs
+
+	pushd "${BUILD_DIR}" &>/dev/null || die
+
+	if use debug; then
+		myeconfargs=(
+			--enable-debug
+			--enable-ftedebug
+			--enable-cpdebug
+			--enable-sensdebug
+			--enable-asdebug
+			--enable-stepdebug
+			--enable-pzdebug
+		)
+	else
+		myeconfargs=(
+			--disable-debug
+			--disable-ftedebug
+			--disable-cpdebug
+			--disable-sensdebug
+			--disable-asdebug
+			--disable-stepdebug
+			--disable-pzdebug
+		)
+	fi
+
+	# As of December 2017, these do not compile
+	myeconfargs+=(
+		--disable-blktmsdebug
+		--disable-smltmsdebug
+	)
+
+	myeconfargs+=(
+		--enable-xspice
+		--enable-cider
+		--disable-dependency-tracking
+		--disable-rpath
+		$(use_enable openmp)
+		$(use_with fftw fftw3)
+		$(use_with readline)
+	)
+
+	if [[ "${MULTIBUILD_VARIANT}" == "shared" ]]; then
+		myeconfargs+=( --with-ngshared )
+	elif [[ "${MULTIBUILD_VARIANT}" == "tcl" ]]; then
+		myeconfargs+=( --with-tcl="${EPREFIX}/usr/$(get_libdir)" )
+	else
+		myeconfargs+=(
+			$(use_enable deprecated oldapps)
+			$(use_with X x)
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	multibuild_foreach_variant ngspice_compile
+}
+
+ngspice_compile() {
+	pushd "${BUILD_DIR}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
+
+src_install() {
+	multibuild_foreach_variant ngspice_install
+
+	# merge the installations of all variants
+	local v
+	for v in "${MULTIBUILD_VARIANTS[@]}" ; do
+		cp -a "${ED}/tmp/${v}"/* "${ED}" || die "Failed to combine multibuild installations"
+	done
+	rm -rf "${ED}/tmp" || die
+
+	use tcl && DOCS+=( README.tcl )
+	use shared && DOCS+=( README.shared-xspice )
+	use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf )
+
+	default
+
+	if use examples; then
+		if ! use tcl; then
+			rm -rf examples/tclspice || die
+		fi
+
+		insinto /usr/share/${PN}
+		doins -r examples
+	fi
+}
+
+ngspice_install() {
+	pushd "${BUILD_DIR}" &>/dev/null || die
+
+	emake DESTDIR="${ED}/tmp/${MULTIBUILD_VARIANT}" install
+
+	# Strip shared-library and Tcl-module builds to the bare minimum;
+	# all the support files will have been handled by the 'binaries' build.
+	if [[ "${MULTIBUILD_VARIANT}" != "binaries" ]]; then
+		rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/bin{,.debug} || die
+		rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/share || die
+		rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la || die
+		rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug} || die
+	fi
+
+	popd &>/dev/null || die
+}
+
+src_test() {
+	if ! use debug; then
+		# tests can be only executed for the binaries variant
+		pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die
+		virtx default
+		popd &>/dev/null || die
+	else
+		# https://sourceforge.net/p/ngspice/bugs/353/
+		ewarn
+		ewarn "Skipping tests because they are known to fail in debug mode"
+		ewarn
+	fi
+}
diff --git a/sci-electronics/quartus-prime-lite/Manifest b/sci-electronics/quartus-prime-lite/Manifest
index f275b4210005..5654386ad3a3 100644
--- a/sci-electronics/quartus-prime-lite/Manifest
+++ b/sci-electronics/quartus-prime-lite/Manifest
@@ -2,6 +2,6 @@ AUX quartus-prime-lite-15.1.0.185-qenv-lib32.patch 483 BLAKE2B e08066d40ccec48e1
 AUX quartus-prime-lite-15.1.0.185-vso-launcher.patch 647 BLAKE2B 5e86aad1d455f4b02dc303ccbd29bd5c22054538c7f1ae78c049ab94ba9dbb8249eb836aa828e3280243066f3cff0e82aea0bfdb55555f33d09ee8aa042e7923 SHA512 19669bf8fd963eab8ab51188e867ed85ea5f0fb151fc82b158a2ab307c6b0ef56b0cd11441fb252b7f70b06d0f7bf8792e6857a62e7ffcd796b1d9d1a156c6e7
 DIST Quartus-lite-15.1.0.185-linux.tar 5969776640 BLAKE2B 622060e053a9d7a91fe9b4b61f6ebf1289f3849e666b20bca801f0bd752dac0f551c7aa2b8d16b6238b6df2b174f8d352bbc2e3a2a9e270735c5581dd81420f5 SHA512 7996bc9e0561b650c0318d608b4f59560dd631e3a38c403105f797049c395ce25a0ff5d4346cf6e91338fa297d7e8752ef5a3f83f496d4431ad3591de4335045
 DIST libfreetype.so.6 785880 BLAKE2B a9c724a213d6211e954c20ea203feeacd384768bf34929719326d2a98e166c91114f4a60b223efd770ccf356662c8664c91d4bf4722325c01d310a10e3026f30 SHA512 4b0ae581df3ecc0117d8b12405d7e5203d1ec40e965c39dade16c4b5495e95c71c2c5d739ccfec7c4c90dd2f48c004f4ae49497c46927adc81c98ead52978be1
-EBUILD quartus-prime-lite-15.1.0.185-r1.ebuild 2704 BLAKE2B d9b7f076d4e58c76198a1efcdba895395e19912981431f87c97cb0b73dbf651aaac65225af4bfcb2bfda532d48fe89e602a97b66cda3e2808afb933d84812b2f SHA512 1e89a2e0d270d0b960d0489f464894eb7dc4d2917cf6a75c1bbf1c29332ec9cee5748b1e17735c8a09fc792852aedb98e2a1c8ddab745890d751dd437542646f
-EBUILD quartus-prime-lite-15.1.0.185.ebuild 1421 BLAKE2B 9f4c43fd6df0c8cf39a15ac2f3c068b6dd60a06d7ba626bd5ef7c685c349a43aa2efff26ac26583098495af66f14c7218036580162b19a4d65a9bbc81310dec1 SHA512 c3cca3fcc95c4c0c92609d83231ebbc42f4c400a0559dcfd8dd1fd6e8053f64da31aa316ec700ed9698f832609b327acb1e3892f85ba82e3c75d3e032d43e1e2
+EBUILD quartus-prime-lite-15.1.0.185-r2.ebuild 1428 BLAKE2B b03e3868ee6b22afc62a841be72ac86824132b9d5e2c39f88dfe983a752397fac1e2eb305956e798f8120277f52e9c058cd9ee51977bf3918fcff20599e73dd2 SHA512 c32116836e73cf80dd51ea94b6f2c16114ef2acf73810b3d8f28ed56e82a055b44f929905fffa3ec2c6fb4befd8ad91ad07b28c0facb5ab3ba41911f4b3d831d
+EBUILD quartus-prime-lite-15.1.0.185-r3.ebuild 2711 BLAKE2B 857c6e118802c04d3104c176cf3928bcfb2aba1344b4f1ffc54e3687ffc14ed96603581779380a773b25b42afbbf461da348f8fb660db1f0914f15f7744f8e9b SHA512 ab4db820d68a38752e13c6541cdf80dd55f278f51bc1f16d8205ae589df93c5ccdf6506b99df67c74c728f53729864fe91c6a217ae020ab731d4d3f5c1ddf554
 MISC metadata.xml 258 BLAKE2B 871ee410113b1513289e4baf0b7fe033c57d4a8757e10727938692237e61b31d45cc143b82259d0409fce2ea7f8db14fe939711b32562606913a279b8160f59f SHA512 d2f23f2bca86165295c1522058d187ba89a2139fb1b7deb3715952825ce278d2a7b2e1d45ffa72876c4de90230b41bbe491ba7df3aa3f5555c63fad67fa59c9c
diff --git a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185.ebuild b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild
index b1ed252e4046..b02113e3f3e5 100644
--- a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185.ebuild
+++ b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild
@@ -15,7 +15,7 @@ LICENSE="Quartus-prime-megacore"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="media-libs/libpng:1.2"
+RDEPEND="media-libs/libpng-compat:1.2"
 
 RESTRICT="fetch bindist"
 
diff --git a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r1.ebuild b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild
index b43ce4f80eec..cd5035370050 100644
--- a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r1.ebuild
+++ b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 # No keywords as per bug 575684
 KEYWORDS=""
 
-RDEPEND="media-libs/libpng:1.2[abi_x86_32]
+RDEPEND="media-libs/libpng-compat:1.2[abi_x86_32]
 		x11-libs/libXft[abi_x86_32]
 		app-arch/bzip2[abi_x86_32]
 		sys-libs/zlib[abi_x86_32]