From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- sci-electronics/gnetman/Manifest | 6 ++-- .../gnetman-0.0.1_pre20110124-build-system.patch | 22 +++++++++++++ .../gnetman-0.0.1_pre20110124-fno-common.patch | 30 +++++++++++++++++ .../files/gnetman-0.0.1_pre20110124-tcl86.patch | 4 +-- .../gnetman/gnetman-0.0.1_pre20110124.ebuild | 38 +++++++++++++--------- 5 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-build-system.patch create mode 100644 sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-fno-common.patch (limited to 'sci-electronics/gnetman') diff --git a/sci-electronics/gnetman/Manifest b/sci-electronics/gnetman/Manifest index d6df5b64262c..d8bf4eb2e586 100644 --- a/sci-electronics/gnetman/Manifest +++ b/sci-electronics/gnetman/Manifest @@ -1,4 +1,6 @@ -AUX gnetman-0.0.1_pre20110124-tcl86.patch 791 BLAKE2B 4d30b2c3991b2f7de62001e90f34bc21d9f705fcdc252b5d0227a699b8cc677c23e3a76a9b614a2daf94e8ba5694f002a4c852dea4013b34a464a5cdaeda9c84 SHA512 42e036a4bbcd3520435d741036f88a775a0fd69ef2af889d529d7b240eb2ac0580b97ec0c41c929122debcb09e16645ac098659cb16b8aed06f87faf1b2b26f2 +AUX gnetman-0.0.1_pre20110124-build-system.patch 726 BLAKE2B 73df2ebce255563d9129ff1a6400092efa58864d35fcb4047329d355a4e694abdbf93848f7d747f443da29bf5fc4e4c7939594b4b1d148e2a32dc2886c93a8bb SHA512 c005f60153399938ce834bfecc74ef1f2f4223e8d2cc84676ded13821767b7dd9a6fb7f4738b52768396d4d9f6f770361f4f3670d9e2007c93fae9e18b81d401 +AUX gnetman-0.0.1_pre20110124-fno-common.patch 912 BLAKE2B e3d10e0424da39441199f4ab0eeb36eeb71961fbd6863e62983f75a9979ee75f164dfc794d72d55c9cee0bcb6e6f20aaa4299e87fcabdd8bc18afb79b25869ed SHA512 89558b0ddadc74ef4bcd8f9a86424d71ebe66286876d0a290e3f6849b3054b2bbbf2ecbe6b0ae1a167cd7c5fba26ae698824054c5c697527ec4f077aecd0bf2e +AUX gnetman-0.0.1_pre20110124-tcl86.patch 666 BLAKE2B ef42aa52662c65def93717dec3872f6dedae59c70a3d5aed7b845c0daedfd506d2dc63809ac45c1f1a55a15aea41c3ca0ed845c3800d7d1a0d9cd8decbe921c9 SHA512 812f9b14c9aa732cf8f83ffd8a457aeae4f7c3e0301459b7498eaaf7485dc8c1781cfe0ee762ed189b62c3a5360eff5f4a487893018255278e5a7715390dff8e DIST gnetman-0.0.1_pre20110124.tar.gz 500308 BLAKE2B 6d5684611e047b70ffacf27ffc55f1f3d6a4064eca4fccf35f2a6d30296b611bed41d524178ed93d5e816b164ceb5b6fcd9c1768f792c64cf62778528ce6fd8a SHA512 d872bf3d4967c201a16e6b625a2003771bb7b33e8af3127a06f445429f575d32451e4ce3cc0f34389cc047b2d0cf2e3ef8afff63b1bf362184e2a5859bbb09f2 -EBUILD gnetman-0.0.1_pre20110124.ebuild 1095 BLAKE2B cbaea0e55f8c3c66abfcbd6b008fb362ad540b266f18f1d0be41b0b0a688ef59321f4b5952a2abcaeed94df25adadea29f08a68ad04de2887b69a3820a1edb13 SHA512 5671c0435662a8b13f951fda9068b20da4c2457d77ca236543cd626c7b095da17696c55491606764e0d5093e546bf14c71a1f9c09c120f4b49595321b3fb0c42 +EBUILD gnetman-0.0.1_pre20110124.ebuild 1060 BLAKE2B 67279ee1c3603d07236b9d849cf9b9c6a19db9bc2f98529f0bad6d23f0f5088503a4941e8405137005db638de45e1b55356eed847e47a9e08ecd044e96a53d73 SHA512 df0ad2e91809ce882f008496603eae01742c6628d84a935b55f1d92e42de504f67e752e5ebfdbd8c5ce0a48cfea0814d2d8e2d7bceb531ce0481aaa07ed27c99 MISC metadata.xml 661 BLAKE2B 354e2807b50d8ede128a79425ae1f408451f1a8fb8aec2b00c61f3a174c71a037971bd37811de837df8b1681201f63ca2175a145274fcbb4c1b1f736855b0728 SHA512 e63b17d3501a7b0c61ddd6ae8b8e442cad7a70ed5e18312a2437071d458c7fecdc5ce9f5b3d82dcc7c68bf7c3f05ca800da606f95bc2180a825b0e4612a7e3fc diff --git a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-build-system.patch b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-build-system.patch new file mode 100644 index 000000000000..2801fb592818 --- /dev/null +++ b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-build-system.patch @@ -0,0 +1,22 @@ +--- a/src/batch/configure ++++ b/src/batch/configure +@@ -72,8 +72,8 @@ + flex -f -Pvr -o../verilog/vrscan.c ../verilog/vrscan.l + swig -tcl8 ../tcl/tclfunc.i + +-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../include -I../spice -I/usr/include/tcl8.4" +-LIBS="-lpopt -ltcl8.4 -lddutil-dbg" ++CFLAGS="${CFLAGS} -W -Wno-unused-parameter -Wno-unused-function -I../include -I../spice" ++LIBS="-lpopt -ltcl -lddutil" + + echo "CC=$CC + CFLAGS=$CFLAGS +@@ -91,7 +91,7 @@ + TARGET='../../bin/gnetman' + + $(TARGET): $(OBJECTS) +- $(CC) $(CFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET) + + clean: + rm -f $(OBJECTS) ../*/*database.[ch] ../*/*scan.c ../*/*parse.c diff --git a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-fno-common.patch b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-fno-common.patch new file mode 100644 index 000000000000..3e247282b403 --- /dev/null +++ b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-fno-common.patch @@ -0,0 +1,30 @@ +--- a/src/sch/schwrite.c ++++ b/src/sch/schwrite.c +@@ -21,7 +21,7 @@ + --------------------------------------------------------------------------------------------------*/ + #include "sch.h" + +-FILE *schFile; ++extern FILE *schFile; + + /*-------------------------------------------------------------------------------------------------- + Write to schFile. +--- a/src/spice/cir.h ++++ b/src/spice/cir.h +@@ -36,5 +36,5 @@ + extern void cirwarn(char *message, ...); + + /* Attribute symbols */ +-utSym cirGraphicalSym, cirNetSym, cirSpiceTypeSym, cirSpiceTextSym; ++extern utSym cirGraphicalSym, cirNetSym, cirSpiceTypeSym, cirSpiceTextSym; + +--- a/src/spice/cirwrite.c ++++ b/src/spice/cirwrite.c +@@ -29,6 +29,7 @@ + FILE *cirFile; + uint32 cirLineNum; + cirRoot cirTheRoot; ++utSym cirGraphicalSym, cirNetSym, cirSpiceTypeSym, cirSpiceTextSym; + + static char *cirLine; + static uint32 cirLinePos, cirLineSize, cirLastBreakPos; diff --git a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch index fdb6573990f4..62f61cc5a4b1 100644 --- a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch +++ b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch @@ -1,5 +1,5 @@ ---- gnetman-0.0.1_pre20110124_orig/src/tcl/tclwrap.c 2012-05-25 07:44:51.000000000 +0200 -+++ gnetman-0.0.1_pre20110124/src/tcl/tclwrap.c 2013-02-24 12:58:51.000000000 +0100 +--- a/src/tcl/tclwrap.c ++++ b/src/tcl/tclwrap.c @@ -46,7 +46,7 @@ result = Tcl_EvalFile(interp, (char *)fileName) == TCL_OK; if (!result) { diff --git a/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild b/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild index 6594de4d08d3..a8d0ede5ad50 100644 --- a/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild +++ b/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild @@ -1,38 +1,44 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A GNU Netlist Manipulation Library" HOMEPAGE="https://sourceforge.net/projects/gnetman/" #snapshot from http://gnetman.git.sourceforge.net/git/gitweb.cgi?p=gnetman/gnetman; SRC_URI="mirror://gentoo/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" -IUSE="doc examples" +SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="doc examples" -S=${WORKDIR}/${P}/src/batch - -RDEPEND=">=dev-lang/tcl-8.6:0 +RDEPEND=" + >=dev-lang/tcl-8.6:0 sci-electronics/geda" DEPEND="${RDEPEND} dev-db/datadraw" -src_prepare() { - sed -e "/^CFLAGS=/s:-g -Wall:${CFLAGS}:" \ - -e "/^CFLAGS=/s:-I/usr/include/tcl8.4::" \ - -e "/^LIBS=/s:-ltcl8.4:-ltcl:" \ - -e '/^$(TARGET):/,+3s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \ - -i configure || die - tc-export CC +S="${WORKDIR}/${P}/src/batch" +PATCHES=( + # fix build issues with tcl-8.6, #452034 + "${FILESDIR}"/${P}-tcl86.patch + # fix build system, #711354 + "${FILESDIR}"/${P}-build-system.patch + # fix -fno-common, #707894 + "${FILESDIR}"/${P}-fno-common.patch +) +src_prepare() { cd ../.. || die - # fix build issues with tcl-8.6, #452034 - epatch "${FILESDIR}/${P}-tcl86.patch" + default +} + +src_configure() { + tc-export CC + default } src_install() { -- cgit v1.2.3