From a833e3f4a431b8eea751b7420e127787f9c92117 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 4 Dec 2017 12:06:33 +0000
Subject: gentoo resync : 04.12.2017

---
 sci-electronics/Manifest.gz                        | Bin 9212 -> 9212 bytes
 sci-electronics/ngspice/Manifest                   |   7 +++--
 .../ngspice/files/ngspice-26-respect-ldflags.patch |  31 +++++++++++++++++++++
 sci-electronics/ngspice/ngspice-26.ebuild          |   6 ++--
 4 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch

(limited to 'sci-electronics')

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index d06604871082..33f15cc4731d 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index 0d1f5bfe7962..0d80ab43a460 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,4 +1,5 @@
-DIST ngspice-26-manual.pdf 2141771 SHA256 30b4fde001d012b0350aae3ba64892fb2f315d04f6761b95abd79f4b7c4cd85d SHA512 1c160aeef61d8091a6d788677bcf7ea682393cc886d5d535f87bb800cdae4f095cbf1e833babadea481956b904b4bdb688cc18b80d9d6a29cab33a54275abab1 WHIRLPOOL 7e9be918599599da3bd6fc754afdc453e1cc6171cabe2afe05da2be24433b4c1ee46728c29995dc62d04d08f966a441a853aa231b37b55e7bcfd587832dcb5b1
-DIST ngspice-26.tar.gz 6925987 SHA256 51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108 SHA512 eb6a81df90de803c9f7544e8d0de7cc413aac169f69d1dec5cc6d2e667b66d42aede7f14c75bcdd10288be0c2ac07863fd4028b9fe59f2f515d680c2ffa41cab WHIRLPOOL cb356ee817fa00ab4a195c8380445adddf6426b5b08ca7c9af1bd96e6f43f3643bc6e4d2d9a7e4a3f3a79f43aa40b0da08721c2e42365c79b5f2e6bad6aef669
-EBUILD ngspice-26.ebuild 2572 BLAKE2B 27bea3d8e0b649ec2af457c498b34f1315b1c1031451a8da75c9d6434ebe5c8364c4088a6f9c7691203459ff1b5c2ba6a72bb16a4c69d6b3dc83d5ab68a3ce55 SHA512 548cdb913056660678e2347dbbe6004d5d6cbf93305678bae2d75678b7fe6db7e2364102932ea81607f8178185e4f541b3b2a46accfa6eda23fa1e89046f67f6
+AUX ngspice-26-respect-ldflags.patch 728 BLAKE2B 7646de91df0a49ab6f5dc6fe58ed5f4044d80a8e5730dddc249dd5c4fb45aff5bf6b8c9bd249edf6bf9bcd16d501334c5116fceea6d181befc846c084d0521aa SHA512 8183ec06e05d9fc22322e8ddef96b72f83681344abf1d9d150fc2058bf906b0eebb83e97c7f39cd74afe316a49ad7a779a3f61f6cd3a79ca967ce037c84bcb98
+DIST ngspice-26-manual.pdf 2141771 BLAKE2B 16956c46640de4696f7197997b170a2b1aad9b2f9fbe299b801de100d8aaca949b5be6f259e353a168ae90d992d91ff65e8a819b49fdf509fae98ec7dfa610d7 SHA512 1c160aeef61d8091a6d788677bcf7ea682393cc886d5d535f87bb800cdae4f095cbf1e833babadea481956b904b4bdb688cc18b80d9d6a29cab33a54275abab1
+DIST ngspice-26.tar.gz 6925987 BLAKE2B 8f8e54000234ea3896a55863df99b6ce83ad322e3049845e0a817635ebfebdc8398e6fa4831727c4798a8d9dce1b1c2a01354505e48dc0b2db9e9036aa2ae5aa SHA512 eb6a81df90de803c9f7544e8d0de7cc413aac169f69d1dec5cc6d2e667b66d42aede7f14c75bcdd10288be0c2ac07863fd4028b9fe59f2f515d680c2ffa41cab
+EBUILD ngspice-26.ebuild 2548 BLAKE2B 533c7db0e236b11332e1f2b572d14b745daa5ce655ad000ad5ef2b5c7cb1248b46f8ad929c8de29de04b5891e4ce15f1361add1f0ff340a8b8db826e1d2b46cd SHA512 89d650f33921f5eba3faede8ae79c5f914e7b1e4d3c192e0bd824ee32ca54c6a0a587a30937bb3c56f1e369fbd8a387f61d381f9fb7e1b3fb9ac05e2ae67f18b
 MISC metadata.xml 535 BLAKE2B 53be75db949e7b32e1ab6eed9ed8ff23acecab02d3018ce2f7e13933fbc2d2a48b085722b52dd9188fa98541c4efdebfdfa111f97bbda5abcf8f9b799c2ee83f SHA512 000662a5b7881c4e2aef407bc63730edfa24360fd49ba8fc4811bbf6a643503d782c36de292084131231600de8a707833952a032c885a0df02985bcb99df8444
diff --git a/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch b/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch
new file mode 100644
index 000000000000..31fe300b105f
--- /dev/null
+++ b/sci-electronics/ngspice/files/ngspice-26-respect-ldflags.patch
@@ -0,0 +1,31 @@
+--- ngspice-26/src/xspice/icm/makedefs.in
++++ ngspice-26/src/xspice/icm/makedefs.in
+@@ -44,16 +44,19 @@
+ LIBS = -lm
+ 
+ # Flags to use when linking shared library
+-LDFLAGS = -shared
+ ifeq ($(ISMINGW), 1)
+-  LDFLAGS = -shared @LDFLAGS@
+-endif
+-ifeq "$(strip $(uname))" "Darwin"
+-  LDFLAGS = -bundle -flat_namespace -undefined suppress
+-endif
+-ifeq "$(strip $(uname))" "SunOS"
+-  ifneq "$(CC)" "gcc"
+-    LDFLAGS = -G
++  LDFLAGS += -shared @LDFLAGS@
++else
++  ifeq "$(strip $(uname))" "Darwin"
++    LDFLAGS += -bundle -flat_namespace -undefined suppress
++  else
++    ifeq "$(strip $(uname))" "SunOS"
++      ifneq "$(CC)" "gcc"
++        LDFLAGS += -G
++      else
++        LDFLAGS += -shared
++      endif
++    endif
+   endif
+ endif
+ 
diff --git a/sci-electronics/ngspice/ngspice-26.ebuild b/sci-electronics/ngspice/ngspice-26.ebuild
index 6150e239ac6d..3c185422f418 100644
--- a/sci-electronics/ngspice/ngspice-26.ebuild
+++ b/sci-electronics/ngspice/ngspice-26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -13,7 +13,7 @@ LICENSE="BSD GPL-2"
 
 SLOT="0"
 IUSE="X debug readline"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
 
 DEPEND="sys-libs/ncurses
 	readline? ( >=sys-libs/readline-5.0 )
@@ -25,9 +25,9 @@ DEPEND="sys-libs/ncurses
 RDEPEND="$DEPEND"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
 	sed -e '/CFLAGS=/s: -s::' -i configure.ac || die "sed failed"
 	sed -e 's/_CFLAGS -O2/_CFLAGS/' -i configure.ac || die "sed failed"
-	sed -e 's/LDFLAGS =/LDFLAGS +=/' -i src/xspice/icm/makedefs.in || die "sed failed"
 	sed -e '/AM_INIT_AUTOMAKE/s:-Werror::' -i configure.ac || die "sed failed"
 	# builds also with ncurses[tinfo] (bug #458128)
 	sed -e 's/ncurses termcap/ncurses termcap tinfo/g' -i configure.ac || die
-- 
cgit v1.2.3