Fix building with automake 1.11 as well as 1.12. Fixes bug #426354.

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

4 files changed, 24 insertions, 35 deletions

diff --git a/sci-electronics/ngspice/ChangeLog b/sci-electronics/ngspice/ChangeLog
index c2cab5ba6bca..8945ea0e98ac 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.3 2012/06/24 08:55:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ngspice/ChangeLog,v 1.4 2012/07/13 13:14:37 flameeyes Exp $
+
+  13 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/ngspice-24-automake-1.12.patch, ngspice-24.ebuild:
+  Fix building with automake 1.11 as well as 1.12. Fixes bug #426354.
 
   24 Jun 2012; Justin Lecher <jlec@gentoo.org> ngspice-24.ebuild,
   +files/ngspice-24-automake-1.12.patch, metadata.xml:
@@ -138,4 +142,3 @@
 
   28 Nov 2003; <plasmaroo@gentoo.org> ng-spice-rework-14.ebuild:
   Initial commit.
-
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index 80cfb6104f28..13b2db05dd8e 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-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 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
+AUX ngspice-23-flags.patch 1661 SHA256 624a669bc8ad76b51a97ccb3a18de0d4286cc6ceffbbc1f6cc3b0d4a3d8efad1 SHA512 af4606612685f760cd3fa3b49d8c0f1c7d8266a04520fed52c34ed74c56cc929ef8c3f7eabc6983629100714042dead9248aa3f6602200c16fd2b5e53409bfc8 WHIRLPOOL bed637406cec961ee8761ed2d9d7038b02455d88f4804c072fbc29d4107a6e9ac06fac4e44174f026846e9bbbb8d5e9589c917b23fcce98400fe332d3f8c599a
+DIST ngspice-23.tar.gz 6485536 SHA256 ce9e4eeaf3ddda6f45d80dda80e2b43e942078ef9fe732361940360ffe6995ef
+DIST ngspice-24.tar.gz 6547948 SHA256 86d2748f6a62db2ed1c4601b24984f6698c88b910bf263ce975467bc6039f065 SHA512 2faf04fb1aa7bc2a92a97cba2d2ad4f15752b9cbe0273db746646cecef5df94d1627dcb926a77f1aa90b6d7bf9a6f4c9a8f27c6f6578c592dbdfdd2107dbe987 WHIRLPOOL 1ed04bf202272a17ea074a4e4eafb776ca83e183840f05f8e48f236a798ab7709e5caa672986177b0914b7db1770770946f8da74fb73771d7f702a687f325d3a
+DIST ngspice23-manual.pdf.gz 1739176 SHA256 45501e8482f01cee2627cfdfb702a0dcce1b19725a8ce1f979d82eaea9450e97
+DIST ngspice24-manual.pdf.gz 1820609 SHA256 dfb87979f285297f1e4c7fdbfc6380cc906f408019cdb39653d8e4411bb94ac4 SHA512 744fe5948a777613d0e4b32bf9f0c01cecfd5235080479e13e97c8b291d43338c1c8e2848ed5d339e0f6d8c2ba014564f40e64c76e48596251c29c25260b7572 WHIRLPOOL 380f02eb4099c4796b6326ab5419ca5d499641c1434b0684abb975a0a931ea306b938f58bc807751b69d1bf30b4c97968a6ce91bdccc3a02347774524429323e
+EBUILD ngspice-23.ebuild 2286 SHA256 2e929309824b8d0d18b5fda2354319678121653b9ad857499e3bcfcab1ddfef7 SHA512 1bf5bc56aaddd1777abad670f92aea1aadf525c74fe187fbf602ccc68ee6c8473d8d47be15fe277a022064a7144d313f4d0f738285182d5bf18e95b4bd36eb61 WHIRLPOOL 9f6ef30e8951cde7962b4623abeeab6d80ca25f5ba16725efd00aec2bc45666034208665f9be5a269992395967319c64edc63bc7ac784ab59c83914f56a133da
+EBUILD ngspice-24.ebuild 2478 SHA256 6f543039050960216302c6be0708afcb787ca1d14edef068a4a02fea812b20cc SHA512 8f64fcd5f2cda224cc9a22998b89218965a8c266ad6a42a9fb652cba909439e8ace68a1b58443bc5f0ece9038f3106c94e6f333f21dbffb5f88ccf990dc5a54b WHIRLPOOL bc296d2b4418959198a958a6a28301a14830458bde1388e479f4bf163349ab9ea77bf592be2905956c8d9701dfca012416c3b663db59e0e7e85017662c3245cf
+MISC ChangeLog 5244 SHA256 ebe09e376bdac9ef8be94dbbf65e624553bb6abd1f212ab1d3b251095a9c20f2 SHA512 5f0b0dbcef83aa38dcb8f168efa4486b63984a8e8a7c1218fdb1bf1d3d3b8bf9dcce7a758c1b24b5995f8bd8ab7739c11de6fcdf30720af3a5ff7397ef52a781 WHIRLPOOL 1fece85801d6450a3ee8352178d614f62fcb3f103101009422c1d586331207aacf130951caaa920eab55770f4775bf9d07d3fc580d607afa8321e7c6aa022c49
+MISC metadata.xml 359 SHA256 08c94251c175bc7c4f708eb5582f8c02e8c62f41971b148287f6f95859ee3666 SHA512 282e8b320c2b618026591a6360cc35e759fa94a55b53e54ca4ad19b38ebe944aa9835ff30a0d8990d8cc94f3b38373709288821b4cacbdaa038b407d6c052568 WHIRLPOOL aaab64a4ce66565d9a0c96b79a0c2ef1b21f5a401ef5a27e0d1d035a15b34294b2b6ce3b6f4430871d77301f7d2aa10cefec5f2a8c979289c1d9c6e8ac157a32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/m1fQACgkQgAnW8HDreRbEGACggAqQZvCxqhS9SsXRopZcWh3G
-GSsAn1Dm0ZtoXtDd1/6s4+9fhXbvmhCD
-=1u6w
+iQEcBAEBAgAGBQJQAB9XAAoJEBzRPIrUMBNCvtIH/2/AZ7zMIWY98iN4f9i/pFrb
+ZNHIQ3g+FtSkiYoZYhEdTJD8MJfAL7qH84KaaNGcEPzPUbQjpNkZM2op+f92hYfZ
+hFnbx/CZfcTD/TA1ouNzzd6Xs9mhHgAD1XvxjZs8xlF0vonW1+fkpaY88tbDSREU
+a3qJhyl08VxH7HFHNLL3rck1wpMR70m3HEtZqEiWbE3+heMowvozRRs0aQ+XnOcP
+jtaGdZWqDmfQ8HEfSlDvW+IraPmzzPVaMRTJRc5ynyo+MFA8lVy6sPCV0YgJpoRk
+qPWzbb0NKU7EPQuE8psVoZ+qFRQYZ+IuIZzFDVOOAIy0Hfc0SWHSSjL4oVD22bQ=
+=QxDk
 -----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
deleted file mode 100644
index c73fb9f0d809..000000000000
--- a/sci-electronics/ngspice/files/ngspice-24-automake-1.12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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/ngspice-24.ebuild b/sci-electronics/ngspice/ngspice-24.ebuild
index b9d0959c068a..1301ea877a0f 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.2 2012/06/24 08:55:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ngspice/ngspice-24.ebuild,v 1.3 2012/07/13 13:14:37 flameeyes Exp $
 
 EAPI="3"
 
@@ -27,7 +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
+	sed -e '/AM_INIT_AUTOMAKE/s:-Werror::' -i configure.ac || die "sed failed"
 	eautoreconf
 }