gentoo resync : 28.04.2021

3 files changed, 34 insertions, 24 deletions

diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest
index be5ef2f6d218..a6e992ccc3ff 100644
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -1,4 +1,4 @@
-AUX gspiceui-1.1.0-flags.patch 1089 BLAKE2B 12754c4c1a8990ccbcda2a61773bdc2efcc14c31b610840c5dc13336dba8c254a65ebf6d6b9a1d335b888c59e66c9bbe473f83d3140c32c15dc5af1235077e6d SHA512 2e55f805d9ea543a4adae3801963c106faccf6781fb9f3699e114acda2994bab22fbdca1872787b662ff3f17c6b9f88736dd3ae51f99b8cdf6a51382ff18b109
+AUX gspiceui-1.1.0-flags.patch 1017 BLAKE2B c240c7d48a50b508b1f4426ab636909856946ce1159c535f0d682994b929faea2be254a39d4ce8f7bedcdc92ff39a8e7af2e29bba11dc8a95e6e71177c47e5e5 SHA512 bdca1e2bbbabf15f02002aab284cf44368e5bb86f9a479ea1194522c5a3e2fa02950795f0dcbc69dd943ec5ade34f134913d643ad13aac6eeb3330e1502e8ab4
 DIST gspiceui-v1.1.00.tar.gz 1048236 BLAKE2B cc3d14137517cd26687dabac7e001e7518fee91aedc74f1995ac763873345f2965c3edb4e037ecb6ac8ca874289b2e658fe3185d95b3eeaf2b349efab151f37b SHA512 46ccf3dd7a5dd9ec1cac1eb742187ecab15a6c0033467d52a44c916e239696faf7b8797e1a155191cf0ed37b04619b0666cff51e78912a06ecd2c63d377cba93
-EBUILD gspiceui-1.1.0.ebuild 1882 BLAKE2B 825f00a8898cd8475c8887c53d6579e2610c546bfb49938575c238bc61d4dbe77f2b2d46284db188456f501841f112ad3e432270dd96dfee0bc124972625f941 SHA512 5b8353b5354234ee9351a2d2ccec2f6907e38c48ac63b6ea2301e3e43a2ead6d478e3eb76a327eea3739cbc6304b3e9719e189e5255b9572aeef6965775a44f0
+EBUILD gspiceui-1.1.0.ebuild 1892 BLAKE2B 21d35e599d7187a7580cd96fc9fdeb00edb48dc8a0eaffdf4230f1a309e3dde514f78391c6926917e95126d320c7dadcf00f905373c0a495b0e1208d9c6e08d2 SHA512 523ca58e4db3a28529f7820c1322cfe27b88457412374b8c57502a9182f23004e3ffd659545958a67f9734261f30e0b3a740545098923478ce227263bab1a044
 MISC metadata.xml 559 BLAKE2B 141eb3da10c0eaec8e922cd82b95bcef416c8a3af0f22f4be3e1c88dc51e1b9d6c1f5055c69c2454e2e7201012e31e7abdd8f085f3e2924fd20d8cb29c3c1211 SHA512 b46400695bafea3a709928e2079d85bd3d610184616c692597e9950a66d0521f0b28437a671ca50d98ba7e1a5526991be41039ce816e2379ec7fbcd11e8ff187
diff --git a/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch b/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch
index 60f2acf0477c..b6c3d36a544e 100644
--- a/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch
+++ b/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch
@@ -1,5 +1,5 @@
---- src/Makefile.old	2015-07-03 18:06:15.000000000 +0200
-+++ src/Makefile	2015-07-03 18:08:50.000000000 +0200
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -69,13 +69,7 @@
  #  -Ofast     Optimize till it hurts : "-O3" + enable opts not valid for all standard-compliants
  #  -Os        Optimize for size
diff --git a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild b/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
index 1444cacb86bb..81c6e4c2d621 100644
--- a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
+++ b/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
@@ -1,34 +1,42 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 WX_GTK_VER="3.0"
-inherit eutils flag-o-matic toolchain-funcs wxwidgets
+inherit desktop flag-o-matic toolchain-funcs wxwidgets
 
 MY_P="${PN}-v${PV}0"
 
 DESCRIPTION="GUI frontend for Ngspice and Gnucap"
 HOMEPAGE="https://sourceforge.net/projects/gspiceui/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="examples schematics waveform"
 
-DEPEND="x11-libs/wxGTK:3.0[X]
+DEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	sci-electronics/electronics-menu"
-RDEPEND="${DEPEND}
-	|| ( sci-electronics/ngspice sci-electronics/gnucap )
+RDEPEND="
+	${DEPEND}
+	|| (
+		sci-electronics/ngspice
+		sci-electronics/gnucap
+	)
 	waveform? ( sci-electronics/gwave )
 	schematics? ( sci-electronics/geda )"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	# Use Gentoo LDFLAGS and CXXFLAGS
+	"${FILESDIR}"/${P}-flags.patch
+)
 
 src_prepare() {
-	# Use Gentoo LDFLAGS and CXXFLAGS
-	epatch "${FILESDIR}/${P}-flags.patch"
+	default
 
 	# Adjusting the doc path at src/main/HelpTasks.cpp
 	sed -i -e \
@@ -37,38 +45,40 @@ src_prepare() {
 
 	# Adjusting call to gwave program
 	sed -i -e "s/gwave2/gwave/g" src/TypeDefs.hpp || die
+}
+
+src_configure() {
+	setup-wxwidgets
 
 	# bug 553968
 	replace-flags -O? -O1
+
+	default
 }
 
 src_compile() {
-	emake CXX=$(tc-getCXX)
+	emake CXX="$(tc-getCXX)"
 }
 
 src_install() {
 	dobin bin/gspiceui
+
+	HTML_DOCS=( html/*.html html/*.jpg html/*.png )
+	einstalldocs
 	dodoc ChangeLog ReadMe ToDo release-notes-v1.1.00.txt
 	doman gspiceui.1
-	newicon src/icons/gspiceui-48x48.xpm gspiceui.xpm
-
-	dohtml html/*.html html/*.jpg html/*.png
 
 	# installing examples and according model and symbol files
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/sch
-		doins -r sch/*
-		insinto /usr/share/doc/${PF}/lib
-		doins -r lib/*
-	fi
+	use examples && dodoc -r lib sch
 
+	newicon src/icons/gspiceui-48x48.xpm gspiceui.xpm
 	make_desktop_entry gspiceui "GNU Spice GUI" gspiceui "Electronics"
 }
 
 pkg_postinst() {
 	if use examples ; then
 		elog "If you want to use the examples, copy and extract from"
-		elog "/usr/share/doc/${PF} the sch and lib directory"
+		elog "${EROOT}/usr/share/doc/${PF} the sch and lib directory"
 		elog "side by side to your home directory to be able"
 		elog "to generate the netlists as normal user."
 	fi