diff options
author | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-01-27 19:25:46 +0100 |
---|---|---|
committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2022-01-27 19:27:54 +0100 |
commit | e79a95397bbf5564ba4b59fdd437b2ebe00d5a1d (patch) | |
tree | 6f1fd3bfbd75ae9f9ed3261e91e4979dfb1d9e87 | |
parent | package.mask: Explicitly mask new pypy3 because of compileall hangs (diff) | |
download | gentoo-e79a95397bbf5564ba4b59fdd437b2ebe00d5a1d.tar.gz gentoo-e79a95397bbf5564ba4b59fdd437b2ebe00d5a1d.tar.bz2 gentoo-e79a95397bbf5564ba4b59fdd437b2ebe00d5a1d.zip |
sci-electronics/gnucap: add version 20210107
Closes: https://bugs.gentoo.org/614656
Bug: https://bugs.gentoo.org/628828
Bug: https://bugs.gentoo.org/792735
Bug: https://bugs.gentoo.org/731854
Bug: https://bugs.gentoo.org/725452
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
-rw-r--r-- | sci-electronics/gnucap/Manifest | 1 | ||||
-rw-r--r-- | sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch | 68 | ||||
-rw-r--r-- | sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch | 208 | ||||
-rw-r--r-- | sci-electronics/gnucap/gnucap-20210107.ebuild | 21 |
4 files changed, 298 insertions, 0 deletions
diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest index db20d354963e..0f8320821363 100644 --- a/sci-electronics/gnucap/Manifest +++ b/sci-electronics/gnucap/Manifest @@ -3,3 +3,4 @@ DIST gnucap-2009-12-07-models-jspice3-2.5.tar.gz 502564 BLAKE2B a0c60671cb338035 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 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" +) |