sci-electronics/ngspice: ADd fix for automake-1.12, #423189

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

5 files changed, 40 insertions, 7 deletions

diff --git a/sci-electronics/ngspice/ChangeLog b/sci-electronics/ngspice/ChangeLog
index e2be906e52cb..c2cab5ba6bca 100644
--- a/sci-electronics/ngspice/ChangeLog
+++ b/sci-electronics/ngspice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/ngspice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ngspice/ChangeLog,v 1.2 2012/05/23 18:43:02 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ngspice/ChangeLog,v 1.3 2012/06/24 08:55:11 jlec Exp $
+
+  24 Jun 2012; Justin Lecher <jlec@gentoo.org> ngspice-24.ebuild,
+  +files/ngspice-24-automake-1.12.patch, metadata.xml:
+  ADd fix for automake-1.12, #423189
 
 *ngspice-24 (23 May 2012)
 
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index 783764d329e1..80cfb6104f28 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX ngspice-23-flags.patch 1661 RMD160 455d2eae1442851f91076cd064da2adfd0ae943f SHA1 1628f03eeb296cbd98b239707ca3570820e08ce4 SHA256 624a669bc8ad76b51a97ccb3a18de0d4286cc6ceffbbc1f6cc3b0d4a3d8efad1
+AUX ngspice-24-automake-1.12.patch 446 RMD160 b130130546d9e760435753d790d0de6a27aa05be SHA1 948bd2ff6927582219c09a7f1d9d1df751015416 SHA256 5549ee4bd715913f64727ff103a63904efc4e5d6bd91a6d8243afbde91adae82
 DIST ngspice-23.tar.gz 6485536 RMD160 34a5bb0a06e67a9ebe21f7abe8067cd8e793ea9e SHA1 65fa23d1168cb3af7651b990344f763c77bf6132 SHA256 ce9e4eeaf3ddda6f45d80dda80e2b43e942078ef9fe732361940360ffe6995ef
 DIST ngspice-24.tar.gz 6547948 RMD160 69363d58ef69724f5ac909dcda278095b12bb8dd SHA1 a6bb0e65c1c07d48f1d3e4df44fc17f6262952eb SHA256 86d2748f6a62db2ed1c4601b24984f6698c88b910bf263ce975467bc6039f065
 DIST ngspice23-manual.pdf.gz 1739176 RMD160 286bfa0dc5b38d0d931cd686d9979c0734a17ea7 SHA1 ea92e50eb84f973bf0b364e75d74416cf69291ce SHA256 45501e8482f01cee2627cfdfb702a0dcce1b19725a8ce1f979d82eaea9450e97
 DIST ngspice24-manual.pdf.gz 1820609 RMD160 ec9a55175ca352530565b224032b5bb04f14a51b SHA1 74606f3d20648837b2543b6ca07e558d228689e2 SHA256 dfb87979f285297f1e4c7fdbfc6380cc906f408019cdb39653d8e4411bb94ac4
 EBUILD ngspice-23.ebuild 2286 RMD160 8c01bff8e8975e11ec2d50d67b039251da2c47b8 SHA1 5d7a46a65469863d95c048814b33fe366e223257 SHA256 2e929309824b8d0d18b5fda2354319678121653b9ad857499e3bcfcab1ddfef7
-EBUILD ngspice-24.ebuild 2400 RMD160 5a403e643c3061017fe5a31f0a1456b567d5edb0 SHA1 0ca88ca03ff3eefee706bf8b00971c12ff4770a3 SHA256 0322191878d9d24349dba97db9b2588dc54b9341d2e26c5b99e69c2a739447c9
-MISC ChangeLog 4897 RMD160 14501408107c9e7b25c2b0596639e381a09e9619 SHA1 b4119d1d41e5871afc5b66acb9ec195d10a19eb0 SHA256 9642b040130c8c10dea04d628ee6717f6639af49c0972c46d324416daeb9de7d
-MISC metadata.xml 361 RMD160 6a0aea151a531b83b4df35307363793de698bc16 SHA1 3e5c1bc6ec70c652533c17535a248e06577be702 SHA256 0cb29147232be6569c365b9e694962c7b606a81ce4c4ce7b404a937378a1d0b8
+EBUILD ngspice-24.ebuild 2444 RMD160 dbd2793eb7d55454991c5d78c7b53839d5ac812f SHA1 97502e25807650f4acb13b74deb2153d44fe316a SHA256 80c8846bee937b5a82091ff8a598f739eb4f9b9c3bc62c39689c41c31682e3b0
+MISC ChangeLog 5053 RMD160 9336b52ea9d503a7cc9c32ee71e6693e572437ab SHA1 9e1043f77cf4bd5ed9d7c5ec308d38adf23b5231 SHA256 dbdbbfd8ee68597beea3af760a94441380daed17552c5ddb8338dbc8c3a23e77
+MISC metadata.xml 359 RMD160 c99cd59677eeb6d412c7000ccdfea3ca02d7079f SHA1 cd42f09544ceb7d02889469c8edc80a132b68430 SHA256 08c94251c175bc7c4f708eb5582f8c02e8c62f41971b148287f6f95859ee3666
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/m1fQACgkQgAnW8HDreRbEGACggAqQZvCxqhS9SsXRopZcWh3G
+GSsAn1Dm0ZtoXtDd1/6s4+9fhXbvmhCD
+=1u6w
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/ngspice/files/ngspice-24-automake-1.12.patch b/sci-electronics/ngspice/files/ngspice-24-automake-1.12.patch
new file mode 100644
index 000000000000..c73fb9f0d809
--- /dev/null
+++ b/sci-electronics/ngspice/files/ngspice-24-automake-1.12.patch
@@ -0,0 +1,16 @@
+ configure.ac |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 51e1722..5275025 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,6 +31,8 @@ AC_CONFIG_HEADER([src/include/ngspice/config.h])
+ dnl Initialise automake stuff
+ AM_INIT_AUTOMAKE([-Wall -Werror nostdinc])
+ 
++AM_PROG_AR
++
+ AC_SUBST([AM_CPPFLAGS],['-I. -I$(srcdir) -I$(top_builddir)/src/include'])
+ 
+ AC_CONFIG_MACRO_DIR([m4])
diff --git a/sci-electronics/ngspice/metadata.xml b/sci-electronics/ngspice/metadata.xml
index 97cd3908e320..9725005c2320 100644
--- a/sci-electronics/ngspice/metadata.xml
+++ b/sci-electronics/ngspice/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-electronics</herd>
-  <longdescription>
+	<herd>sci-electronics</herd>
+	<longdescription>
   Ngspice is a mixed-level/mixed-signal circuit simulator. Its code is based on
   three open source software packages: Spice3f5, Cider1b1 and Xspice.
   </longdescription>
diff --git a/sci-electronics/ngspice/ngspice-24.ebuild b/sci-electronics/ngspice/ngspice-24.ebuild
index 4409a03b6ae3..b9d0959c068a 100644
--- a/sci-electronics/ngspice/ngspice-24.ebuild
+++ b/sci-electronics/ngspice/ngspice-24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ngspice/ngspice-24.ebuild,v 1.1 2012/05/23 18:43:02 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ngspice/ngspice-24.ebuild,v 1.2 2012/06/24 08:55:11 jlec Exp $
 
 EAPI="3"
 
@@ -27,6 +27,7 @@ RDEPEND="$DEPEND"
 src_prepare() {
 	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"
+	epatch "${FILESDIR}"/${P}-automake-1.12.patch
 	eautoreconf
 }