gentoo resync : 02.02.2022

4 files changed, 301 insertions, 0 deletions

diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest
index e218864760ab..a1a47e2491e6 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -1,7 +1,11 @@
+AUX gnucap-20210107-fix-paths.patch 2683 BLAKE2B 17b1eb4e0907b0e29e9205118d718f4da791f607fcbe9b63200c2c033e15a54fd305a25a5ba6c8440a84c15117175c912b53f8420e11b251ffe98ee505982faf SHA512 8d3be906e263e5444c4dd9ae9cc3ce241ab49a9fe9e4ee947a0ec594336f980a79d9a62905391d2ba2f510e2f2157dd8b9482bd384c7042ed8b893d51aefcfea
+AUX gnucap-20210107-respect-ldflags.patch 4151 BLAKE2B bb169c64b85625151d1edbdd06de0922459a94a6233164f11f1673d5863abf785e919e5a7484127a1ce6b2892eb3aa44c8dcbcf7e6c58e8538846e187e856e0a SHA512 1df0dce4e1aa44f540f731dad1bd85b72b90422b38e29a7c1a80f3d79e83a0fb4501895da2783e6d92e9301e5921e8a75940bdaf633be53fe6fb2fd22a200a56
 DIST gnucap-2009-12-07-models-bsim.tar.gz 4074699 BLAKE2B e8d48be7eb22bfe360a4cd80e3605b292be7839100e1ebd40a718bc23c5f9d2330fb3a58c9c18bebaf8b87a6fad3002f5596a4f83e41eefa0eab8f4ed5d9b18e SHA512 4f7caaeab0268df113da726f4fbd5a0f3eff63c325a7c08f0cd10ec727318aff6a51ce81619f0f3e31b87f89a51643cd608cb14ba09a70fb7294df9748ed1db4
 DIST gnucap-2009-12-07-models-jspice3-2.5.tar.gz 502564 BLAKE2B a0c60671cb338035035a50cdc6f2d7e9df9aaf7f2ee3c0bd600ec4d0a8aafd2628c6acf37c89f9f7c7ec3879220dc81ceec191ad9cc0a31def76d6df5bba1606 SHA512 90d93912d5d000218f43e7b63efcd43473467d7d51c1cee160f3fbe53b0bafd5bdeaf5680e2ca67d3176063ba026352248412d1e266d3f6ed93e731e476d61fe
 DIST gnucap-2009-12-07-models-ngspice17.tar.gz 4418060 BLAKE2B b7d300cc93b870b13eab25d4b0303af647303551f2777e61cc38d18d770e9b446b9a1e4f8fd94b81c11f96eb1c6bac4ef113f69806a979ac3fe69903e0855d91 SHA512 0f26b4491531d41f18d35b8cde339e99b593794495346186dac74f72bd3632dfe4690ede50a972c47ae41b2229a62d708ecd28bb8fc04b5b7347a481bca709d5
 DIST gnucap-2009-12-07-models-spice3f5.tar.gz 629424 BLAKE2B 3369374942a0b0b14dc484a6d49b9650d461112f15623f43b1140a4bddd4d23a6035c4c31294f1003828b93bc21b1c1c059acf61c2db85c9578bb8162e247234 SHA512 4c16e4bcdd3b4092bd6c89c56421ef9ca85b6aba90d9e244fee03278916c6b5ac1c56ecba62d4a5561ff3d93abc61492c0116ccc350c483128ca792b52fa7155
 DIST gnucap-2009-12-07.tar.gz 545578 BLAKE2B a1ff8ed82a8ab57c455fdb96c399a5e480b1eb898d439e39380c4287d65538e9c0e1f61aef08c616aff34390a507243edc1fbb2f55b2bfc6d383264e2281e1c9 SHA512 c0e8a4f6b66eeff2cf95e9cf2050a25aa08f660de1e4b3e78011998deb93cd4e5b562cdcf5f3beb72e04cb3c7650cde6ae8c81602ffc31f5e333d84e7e3867a9
+DIST gnucap-20210107.tar.gz 801944 BLAKE2B fcef1e234710575285446c63cae85e2ef7e82e74ab65627614b8cc2bd0511427b63aa352a335c2b56c159b9129ce4cac998b86ddd29c19f9c57a63cfc2354676 SHA512 7f85a69f73808091b0826bb671174ad2515771c36e624031fb2fe79671366c57cd20ce9c973359869146a90fc568bc0ae1c354655e9d5cd75507b069f45cbfb7
 EBUILD gnucap-0.35.20091207-r1.ebuild 2114 BLAKE2B 5043eb866c439ed881cfe01f58e6666362dcd480765a342f7363d01d1e969eaf95ce4aa85d5ed23295fbcfbe1269e094b2d6fec5a50fc7df91cfc09b6c364af8 SHA512 b27f2c5c55bde8a2fcf2790f7ba37517c44959a9cf02de9eb482e7ad2e640185fcb7c5dc03e133ecc50f861736a57110e76ad68d5576804fdb053ace5b428778
+EBUILD gnucap-20210107.ebuild 492 BLAKE2B 3fa7cd89ffcd9779e987a019112eac06902c50701a51bde131666536718b2bbe525712a8dc320aa7adec8eef43057608f2d8119ef8d5b3250e882f8f21639a85 SHA512 e04ca57ec66df550ecb1f2c9f6aec27c3da257fee3097217eeb2a3a3359526236be6111e2c6d2a19997ac8e65fce09e922df5a3b2434e897484e2ad499167f2f
 MISC metadata.xml 745 BLAKE2B e60b11b8af54db5c7f8080f7397a82a2c6583cf517cc5d1f4a0db7af846015d385584a05e3725d2a60b448e448fe350ed020806ec5ce66f4e42e4b830dd8fd3d SHA512 55022ee6b895bcc4ffe24f2d784cdec87eaa66965b27017dbe5ce993daa829d667f5e22df298c31e3df4d73d120a3293f7d68a59b66b866015fa502afb5b6eae
diff --git a/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch b/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch
new file mode 100644
index 000000000000..455475fa7cde
--- /dev/null
+++ b/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch
@@ -0,0 +1,68 @@
+diff --git a/apps/Make1 b/apps/Make1
+index 43a2266..a29b29f 100644
+--- a/apps/Make1
++++ b/apps/Make1
+@@ -23,7 +23,7 @@ TARGET = gnucap-default-plugins
+ #------------------------------------------------------------------------
+ INSTALL_FILES = $(TARGET)$(TARGET_EXT)
+ #------------------------------------------------------------------------
+-INSTALL_DIR = $(PREFIX)/lib/gnucap
++INSTALL_DIR = $(PREFIX)/lib64/gnucap
+ #------------------------------------------------------------------------
+ DELETED =
+ #------------------------------------------------------------------------
+diff --git a/lib/Make1 b/lib/Make1
+index 27f839f..bd9fbfb 100644
+--- a/lib/Make1
++++ b/lib/Make1
+@@ -23,7 +23,7 @@ TARGET = libgnucap
+ #------------------------------------------------------------------------
+ INSTALL_FILES = $(TARGET)$(TARGET_EXT)
+ #------------------------------------------------------------------------
+-INSTALL_DIR = $(PREFIX)/lib
++INSTALL_DIR = $(PREFIX)/lib64
+ #------------------------------------------------------------------------
+ DELETED =
+ #------------------------------------------------------------------------
+diff --git a/main/Make1 b/main/Make1
+index 14d44c7..2d92c1f 100644
+--- a/main/Make1
++++ b/main/Make1
+@@ -24,7 +24,7 @@ TARGET = gnucap
+ INSTALL_DIR = $(PREFIX)/bin
+ INSTALL_FILES = $(TARGET)$(TARGET_EXT) ../gnucap-conf
+ #------------------------------------------------------------------------
+-INSTALL_SYSCONF_DIR = $(PREFIX)/etc
++INSTALL_SYSCONF_DIR = $(PREFIX)/../etc
+ INSTALL_SYSCONF_FILES = ../gnucap.conf
+ #------------------------------------------------------------------------
+ DELETED =
+diff --git a/main/configure b/main/configure
+index b68d06a..47e43a2 100755
+--- a/main/configure
++++ b/main/configure
+@@ -23,8 +23,8 @@ fi
+ 
+ sed -e "s#/usr/local#$prefix#" ../Makefile.template > Makefile
+ #----------------------------------------------------------------
+-pkglibdir='${prefix}/lib/gnucap'
+-pkglibdir_expanded="${prefix}/lib/gnucap"
++pkglibdir='${prefix}/lib64/gnucap'
++pkglibdir_expanded="${prefix}/lib64/gnucap"
+ 
+ # bug. this is not implemented consistently.
+ CXX=${CXX-c++}
+@@ -32,11 +32,11 @@ CXX=${CXX-c++}
+ fill_template() {
+ sed -e "s#@prefix@#$prefix#" \
+     -e "s#@exec_prefix@#$prefix#" \
+-    -e "s#@libdir@#$prefix/lib#" \
++    -e "s#@libdir@#$prefix/lib64#" \
+     -e "s#@includedir@#$\{prefix\}/include#" \
+     -e "s#@datarootdir@#$\{prefix\}/share/gnucap#" \
+     -e "s#@docdir@#$\{prefix\}/share/doc/gnucap#" \
+-    -e "s#@sysconfdir@#$\{prefix\}/etc#" \
++    -e "s#@sysconfdir@#$\{prefix\}/../etc#" \
+     -e "s#@pkglibdir@#$pkglibdir#" \
+     -e "s#@pkglibdir_expanded@#$pkglibdir_expanded#" \
+     -e "s#@CXXFLAGS@#$CCFLAGS#" \
diff --git a/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch b/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch
new file mode 100644
index 000000000000..5456373cda29
--- /dev/null
+++ b/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch
@@ -0,0 +1,208 @@
+diff --git a/apps/Make2.Debug b/apps/Make2.Debug
+index b35ac81..f437b76 100644
+--- a/apps/Make2.Debug
++++ b/apps/Make2.Debug
+@@ -41,7 +41,7 @@ CCFLAGS = \
+ 
+ LIBS = \
+ 
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ 
+ %.SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/apps/Make2.g++ b/apps/Make2.g++
+index c7581c9..443c0e8 100644
+--- a/apps/Make2.g++
++++ b/apps/Make2.g++
+@@ -32,7 +32,7 @@ CCFLAGS = \
+ 
+ LIBS = \
+ 
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ 
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/apps/Make2.mingw32 b/apps/Make2.mingw32
+index 8a9345e..df5f7f6 100644
+--- a/apps/Make2.mingw32
++++ b/apps/Make2.mingw32
+@@ -30,7 +30,7 @@ CCFLAGS = \
+ 
+ LIBS = -lgnucap
+ 
+-LDFLAGS = -shared  -L../../lib/MSW
++LDFLAGS += -shared  -L../../lib/MSW
+ 
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/apps/configure b/apps/configure
+index 1fbb987..6b684af 100755
+--- a/apps/configure
++++ b/apps/configure
+@@ -38,7 +38,7 @@ VPATH = .:..
+ CCC = c++
+ TARGET_EXT = .so
+ 
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ 
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/lib/Make2.Debug b/lib/Make2.Debug
+index b0e180a..7cfe919 100644
+--- a/lib/Make2.Debug
++++ b/lib/Make2.Debug
+@@ -43,7 +43,7 @@ LIBS = \
+ -lreadline -ltermcap \
+ -ldl
+ 
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ 
+ %.SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/lib/Make2.g++ b/lib/Make2.g++
+index 7dd1598..a240c53 100644
+--- a/lib/Make2.g++
++++ b/lib/Make2.g++
+@@ -35,7 +35,7 @@ LIBS = \
+ -lreadline -ltermcap \
+ -ldl
+ 
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ 
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/lib/Make2.mingw32 b/lib/Make2.mingw32
+index 27a2c51..bf7c663 100644
+--- a/lib/Make2.mingw32
++++ b/lib/Make2.mingw32
+@@ -31,7 +31,7 @@ CCFLAGS = \
+ 
+ LIBS =
+ 
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ 
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/lib/configure b/lib/configure
+index a10a76e..4a07543 100755
+--- a/lib/configure
++++ b/lib/configure
+@@ -49,7 +49,7 @@ VPATH = .:..
+ CCC = c++
+ TARGET_EXT = .so
+ 
+-LDFLAGS = -shared
++LDFLAGS += -shared
+ 
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/main/Make2.Debug b/main/Make2.Debug
+index e531639..31f7fa8 100644
+--- a/main/Make2.Debug
++++ b/main/Make2.Debug
+@@ -39,7 +39,7 @@ CCFLAGS = \
+ LIBS = \
+ -lgnucap \
+ 
+-LDFLAGS = -rdynamic  \
++LDFLAGS += -rdynamic  \
+ -L../../lib/O-DEBUG
+ 
+ %.SUFFIXES:
+diff --git a/main/Make2.g++ b/main/Make2.g++
+index 8991962..8add8f6 100644
+--- a/main/Make2.g++
++++ b/main/Make2.g++
+@@ -31,7 +31,7 @@ CCFLAGS = \
+ LIBS = \
+ -lgnucap \
+ 
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O
+ 
+ .SUFFIXES:
+diff --git a/main/Make2.mingw32 b/main/Make2.mingw32
+index b6150e6..0175914 100644
+--- a/main/Make2.mingw32
++++ b/main/Make2.mingw32
+@@ -30,7 +30,7 @@ CCFLAGS = \
+ 
+ LIBS = -lgnucap
+ 
+-LDFLAGS = -L../../lib/MSW
++LDFLAGS += -L../../lib/MSW
+ 
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/main/configure b/main/configure
+index 9c43821..b68d06a 100755
+--- a/main/configure
++++ b/main/configure
+@@ -65,7 +65,7 @@ VPATH = .:..
+ CCC = c++
+ TARGET_EXT =
+ 
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O
+ 
+ .SUFFIXES : .o .cc
+diff --git a/modelgen/Make2.Debug b/modelgen/Make2.Debug
+index e531639..31f7fa8 100644
+--- a/modelgen/Make2.Debug
++++ b/modelgen/Make2.Debug
+@@ -39,7 +39,7 @@ CCFLAGS = \
+ LIBS = \
+ -lgnucap \
+ 
+-LDFLAGS = -rdynamic  \
++LDFLAGS += -rdynamic  \
+ -L../../lib/O-DEBUG
+ 
+ %.SUFFIXES:
+diff --git a/modelgen/Make2.g++ b/modelgen/Make2.g++
+index 8991962..8add8f6 100644
+--- a/modelgen/Make2.g++
++++ b/modelgen/Make2.g++
+@@ -31,7 +31,7 @@ CCFLAGS = \
+ LIBS = \
+ -lgnucap \
+ 
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O
+ 
+ .SUFFIXES:
+diff --git a/modelgen/Make2.mingw32 b/modelgen/Make2.mingw32
+index 63b9657..813c5f4 100644
+--- a/modelgen/Make2.mingw32
++++ b/modelgen/Make2.mingw32
+@@ -30,7 +30,7 @@ CCFLAGS = \
+ 
+ LIBS = -lgnucap
+ 
+-LDFLAGS = -L../../lib/MSW
++LDFLAGS += -L../../lib/MSW
+ 
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/modelgen/configure b/modelgen/configure
+index d11d07e..3193444 100755
+--- a/modelgen/configure
++++ b/modelgen/configure
+@@ -39,7 +39,7 @@ VPATH = .:..
+ CCC = c++
+ TARGET_EXT =
+ 
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O
+ 
+ .SUFFIXES : .o .cc
diff --git a/sci-electronics/gnucap/gnucap-20210107.ebuild b/sci-electronics/gnucap/gnucap-20210107.ebuild
new file mode 100644
index 000000000000..f898c65a2a47
--- /dev/null
+++ b/sci-electronics/gnucap/gnucap-20210107.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNUCap is the GNU Circuit Analysis Package"
+SRC_URI="https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${P}.tar.gz"
+HOMEPAGE="http://www.gnucap.org/"
+
+IUSE="examples"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="sys-libs/readline:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-respect-ldflags.patch"
+	"${FILESDIR}/${P}-fix-paths.patch"
+)