gentoo auto-resync : 06:07:2024 - 08:06:15

7 files changed, 66 insertions, 136 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 7b18b5bd7d8b..23d646f36c9e 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest
index 82521fef9162..d08506054b60 100644
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -1,8 +1,7 @@
-AUX gspiceui-1.1.0-flags.patch 1017 BLAKE2B c240c7d48a50b508b1f4426ab636909856946ce1159c535f0d682994b929faea2be254a39d4ce8f7bedcdc92ff39a8e7af2e29bba11dc8a95e6e71177c47e5e5 SHA512 bdca1e2bbbabf15f02002aab284cf44368e5bb86f9a479ea1194522c5a3e2fa02950795f0dcbc69dd943ec5ade34f134913d643ad13aac6eeb3330e1502e8ab4
 AUX gspiceui-1.2.87-respect-users-flags.patch 2257 BLAKE2B 54d18a89166b45fc121fc6f62cb346ef7cb8a6ae7ff5b5835a10aa2de4134ccb872c2cfc988a45636d54622912af9a1b9762b6964f2daf3730592b982cdff9a5 SHA512 a03dd8f0f150fca14f8fe26155920fc3da535c8313b12b5ff8746cc61a1fed765f86ce012e9e6639eb77b1a854acc76c4b0f80fe224cefbd9e3df97c72143412
-DIST gspiceui-v1.1.00.tar.gz 1048236 BLAKE2B cc3d14137517cd26687dabac7e001e7518fee91aedc74f1995ac763873345f2965c3edb4e037ecb6ac8ca874289b2e658fe3185d95b3eeaf2b349efab151f37b SHA512 46ccf3dd7a5dd9ec1cac1eb742187ecab15a6c0033467d52a44c916e239696faf7b8797e1a155191cf0ed37b04619b0666cff51e78912a06ecd2c63d377cba93
+AUX gspiceui-1.3.30_pre20240321-respect-users-flags.patch 1767 BLAKE2B c90b5b3ff1a353ee533c3525c3d1a76d3592c05c942eb42e8a52f15c36a3c5d395cef4f8bc91c3756f3567ff27cd2067a4776249cbfad62bdc21e36cacf6a108 SHA512 3b08f4c0cf9a82f4a006c18e5d82660fc83cd14e9bf6080c3c259c66efec0e810396d3977c36895ad0b4aa636f68e32ba440af0b426510a0286cd4f76caba0c2
+DIST gspiceui-1.3.30_pre20240321.zip 80103549 BLAKE2B 5cdbd2338dd057d73a01572e75a7af145bca99f3e9339d259ae3615076e26a5c1614eecdd1e32cd669ecdd2a5cc1e3934dc3d3f1b36980c7a2eed7c6c15e1bb6 SHA512 736f7eafbaa26c3d9b3fa0df1ae5071adf21c0716519a99a0b9d199aa10a0dd402273de51d2e16b07be4c145ab2d34e133c515a8cfbb44068aa46cdc36a20658
 DIST gspiceui-v1.2.87.tar.gz 1089733 BLAKE2B c1801bfebd5d42fe9c1ab26e6fd0cb06b56cac53bbad272522896325e5fd979e6fcc63d6f99262b152180f249b5b2d4aa119aa83254a2fc07256574c9ebaef10 SHA512 081d04c39f4fb96139f12fa063dfb888e036948a00a6b55de3b04a49b2b4af01b45fd9b7f903855d798a71957452550dfa8c8505c167c239e27ada29cb6fa747
-EBUILD gspiceui-1.1.0.ebuild 1906 BLAKE2B 8c60a04e63a37cf4f1ecbfee9b664eb93eb0390508116f349718ce54a36b74e3e4716f76e50f0a790ad426afeb3af7a2f5869043963d0e4c80c5593a4c924c1c SHA512 008ff5aecb2d5ea9436ff1cafb4f03884d8013a5a9368d6c8e3a7634cdc5b62b91c456bd97d5084cd137b93f3fe770c982c7c9298036a9ad24dc2aebfee9b1e3
-EBUILD gspiceui-1.2.87-r1.ebuild 1911 BLAKE2B 32c5cc249246ec16aacf73b99a9197c242ff4781d31761265ddb5e47de968435ebab5a69e8c4a9f3c66feb4c773f8d4247ceb63ff7782199a8d0731b7a304d8b SHA512 296ffa6acc62634a831cd230b6f039d459adfa392f1422aa4674377f403d62dbd67234306484ad06903d33775fbf5b7b40381361f444f455606b9138505bd355
 EBUILD gspiceui-1.2.87.ebuild 1850 BLAKE2B 4660fbbcc57f6bd64c0606ff5913d0c11b951fe78f1c6e32cbda454f93da9867328d338afe8a607f9fa85c930185e5b214ba1aaca4bb034037e0b87c4d2ffce5 SHA512 6fad8fc4ceaf09e4e640c13ddcecae215b25af45e1455022b648073bb0129db463e3c5ebbd6b7e6d75e3d672ccdd1bdc7eabeafbd16e61f143ecadfb29b0899e
-MISC metadata.xml 560 BLAKE2B 7bf55c85b52ee2e7b7627cddf9fed3aef875057b32348cc770ae4f1765e415f24184769ddf4c308b107f2d3d87a53f0bec0aa0e7b67932536a669a6e1e447f0d SHA512 6700697e40e911690b27fdf068d3cb15c0b03c59e8af0258459109d27a6e709911f60fd555d59ce8b02143f36d1d462e1e6f336a8573e45537c6a6a6c3d4b67d
+EBUILD gspiceui-1.3.30_pre20240321.ebuild 2005 BLAKE2B f36b5965c0ccf84141f581f0be441363f75f1155ced1e3030b68b2093c7f473b0509cc77acb36c16fb58935efc1ff8367f81d27f24bfc71f997bd4397b5e8e09 SHA512 b75965c531d35e033b6179532efeff8492d56069068289d3f134d03c7e08831321e65b949ebaecdb3f3016ded137e2a110876dbc6aa7ed48a4c6269f2b6e5862
+MISC metadata.xml 358 BLAKE2B be14ad7e71ebdbd22ef7025a9b86076338602962439bf592c1af8a6d87bb74ccf0e3097b558e5a38fbbb0b03c00da8a8d26673b2078ff7724e014ceb5febac1b SHA512 1febab64f8bd13fe6614c7d2ef62d2a1bf0b596ba0964af82c58db83afa3e9cdd034e211664586c1dafbeb4f98e7dd1893614da9ed2f22a3ec4d82250d4dfc9a
diff --git a/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch b/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch
deleted file mode 100644
index b6c3d36a544e..000000000000
--- a/sci-electronics/gspiceui/files/gspiceui-1.1.0-flags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
- #  -Og        Optimize debugging experience but don't break debugging
--ifeq ($(GSPICEUI_DBG),0)
--  # Options for release (not using -Wall since it's GCC specific)
--  CXXFLAGS := -O1 -pipe $(shell $(WXCFG) --cxxflags)
--else
--  # Options for development
--  CXXFLAGS := -g -Og -Wall -Wextra -pipe $(shell $(WXCFG) --cxxflags)
--endif
-+  CXXFLAGS += $(shell $(WXCFG) --cxxflags)
- 
- # The following suppresses spurious warnings from gcc with wxWidgets v2.8.12
- ifeq ($(GSPICEUI_WXLIB),2.8)
-@@ -134,7 +128,7 @@
- #   -o     specify the output file name
- 
- $(BINDIR)/$(PROG) : $(OBJS)
--	$(CXX) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
-+	$(CXX) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS)
- ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
- 	cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
- endif
diff --git a/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch b/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch
new file mode 100644
index 000000000000..531491829bd3
--- /dev/null
+++ b/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch
@@ -0,0 +1,50 @@
+--- a/src/Makefile.old	2024-06-21 11:25:45.990728109 +0200
++++ b/src/Makefile	2024-06-21 11:33:20.289571247 +0200
+@@ -46,8 +46,8 @@
+ #***************************************************************************************************
+ 
+ # Which compiler and linker (eg. g++ or clang++)
+-CXX = g++
+-LD  = g++
++CXX ?= g++
++LD  ?= g++
+ ifneq ($(GSPICEUI_MSWIN),0)
+   LD += -static-libstdc++ -static-libgcc
+   WINDRES = windres
+@@ -108,17 +108,7 @@
+ #  -fabi-version=N  Use version N of the C++ ABI (this choice must match the wxWidgets library)
+ 
+ CXXFLAGS := -std=c++17 -fabi-version=14
+-ifeq ($(GSPICEUI_DEBUG),0)
+-  # Options for release (not using -Wall since it's GCC specific)
+-  CXXFLAGS += -O3
+-else
+-  # Options for development
+-  CXXFLAGS += -g3 -O0 -Wall -Wextra -Wpedantic
+-
+-  # The following warning has been disabled because I don't know how to fix it
+-  CXXFLAGS += -Wno-overloaded-virtual
+-endif
+-CXXFLAGS += -pipe $(shell $(WXCFG) --cxxflags)
++CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+ 
+ # I like to compile using the option "-Wall" etc. however tests that break wxWidgets are turned off
+ ifneq ($(GSPICEUI_DEBUG),0)
+@@ -231,7 +221,7 @@
+ #   -o     specify the output file name
+ 
+ $(BINDIR)/$(PROG) : $(OBJS)
+-	$(LD) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
++	$(CXX) -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS)
+ ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
+ 	cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
+ endif
+@@ -296,7 +286,7 @@
+ 
+ # Compiler options
+ 
+-test_% : CXXFLAGS  = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
++test_% : CXXFLAGS  += $(shell $(WXCFG) --cxxflags)
+ test_% : CXXFLAGS += -D $(shell echo $@ | tr "[:lower:]" "[:upper:]")
+ # Libraries
+ test_% : LIBS = $(shell $(WXCFG) --libs core,base)
diff --git a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild b/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
deleted file mode 100644
index d16a8b170d38..000000000000
--- a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-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="https://downloads.sourceforge.net/${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:${WX_GTK_VER}[X]
-	sci-electronics/electronics-menu"
-RDEPEND="
-	${DEPEND}
-	|| (
-		sci-electronics/ngspice
-		sci-electronics/gnucap
-	)
-	waveform? ( sci-electronics/gwave )
-	schematics? ( sci-electronics/geda )"
-
-PATCHES=(
-	# Use Gentoo LDFLAGS and CXXFLAGS
-	"${FILESDIR}"/${P}-flags.patch
-)
-
-src_prepare() {
-	default
-
-	# Adjusting the doc path at src/main/HelpTasks.cpp
-	sed -i -e \
-		"s:/share/gspiceui/html/User-Manual.html:/share/doc/${PF}/html/User-Manual.html:g" \
-		src/main/HelpTasks.cpp || die
-
-	# 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)"
-}
-
-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
-
-	# installing examples and according model and symbol files
-	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 "${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
-}
diff --git a/sci-electronics/gspiceui/gspiceui-1.2.87-r1.ebuild b/sci-electronics/gspiceui/gspiceui-1.3.30_pre20240321.ebuild
index 9247c5e0c84a..9b8cb5aa5a98 100644
--- a/sci-electronics/gspiceui/gspiceui-1.2.87-r1.ebuild
+++ b/sci-electronics/gspiceui/gspiceui-1.3.30_pre20240321.ebuild
@@ -6,12 +6,14 @@ EAPI=8
 WX_GTK_VER="3.2-gtk3"
 inherit desktop optfeature wxwidgets xdg
 
-MY_P="${PN}-v${PV}"
-
 DESCRIPTION="GUI frontend for Ngspice and Gnucap"
 HOMEPAGE="https://sourceforge.net/projects/gspiceui/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+#SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
+MY_REV="382"
+# SF source is temporal
+#SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gs/${PN}/code/${PN}-code-r${MY_REV}-trunk.zip -> ${P}.zip"
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-code-r${MY_REV}-trunk.zip -> ${P}.zip"
+S="${WORKDIR}/${PN}-code-r${MY_REV}-trunk"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -29,29 +31,23 @@ RDEPEND="
 		sci-electronics/gnucap
 	)
 "
+BDEPEND="app-arch/unzip"
 
 PATCHES=(
 	# Use Gentoo LDFLAGS and CXXFLAGS
+	# https://sourceforge.net/p/gspiceui/bugs/30/
 	"${FILESDIR}"/${P}-respect-users-flags.patch
 )
 
-src_prepare() {
-	default
-
-	# Adjusting the doc path at src/main/FrmHtmlVwr.cpp
-	sed -i -e \
-		"s:/share/gspiceui/html/User-Manual.html:/share/doc/${PF}/html/User-Manual.html:g" \
-		src/main/FrmHtmlVwr.cpp || die
-}
-
 src_configure() {
 	setup-wxwidgets
 	default
 }
 
 src_compile() {
-	# GSPICEUI_WXLIB=3.0 also works for 3.2
-	emake GSPICEUI_WXLIB=3.0
+	export HOME="${T}"
+	mkdir -p "${T}/.config"
+	emake GSPICEUI_WXLIB=3.2 GSPICEUI_DEBUG=0
 }
 
 src_install() {
@@ -59,7 +55,7 @@ src_install() {
 
 	einstalldocs
 	dodoc html/*.html html/*.jpg html/*.png
-	dodoc ChangeLog ReadMe ToDo release-notes-v${PV}.txt
+	dodoc ChangeLog ReadMe ToDo
 	doman gspiceui.1
 
 	# installing examples and according model and symbol files
diff --git a/sci-electronics/gspiceui/metadata.xml b/sci-electronics/gspiceui/metadata.xml
index c0d060cb2ffc..b4f5b4f99af0 100644
--- a/sci-electronics/gspiceui/metadata.xml
+++ b/sci-electronics/gspiceui/metadata.xml
@@ -5,10 +5,6 @@
     <email>sci-electronics@gentoo.org</email>
     <name>Gentoo Electronics Project</name>
   </maintainer>
-  <use>
-    <flag name="schematics">Use <pkg>sci-electronics/geda</pkg> for schematics editing</flag>
-    <flag name="waveform">Use <pkg>sci-electronics/gwave</pkg> for waveform display</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">gspiceui</remote-id>
   </upstream>