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

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

3 files changed, 7 insertions, 20 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/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
 }