fix build with automake-1.13 wrt #486414

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 135 insertions, 4 deletions

diff --git a/dev-util/insight/ChangeLog b/dev-util/insight/ChangeLog
index 83958f891ff9..c4eeafd48ddf 100644
--- a/dev-util/insight/ChangeLog
+++ b/dev-util/insight/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/insight
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.56 2013/02/04 07:16:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.57 2013/11/03 17:09:14 hasufell Exp $
+
+  03 Nov 2013; Julian Ospald <hasufell@gentoo.org> insight-6.8.1.ebuild,
+  insight-6.8.1-r1.ebuild, +files/insight-6.8.1-automake-1.13.patch:
+  fix build with automake-1.13 wrt #486414
 
 *insight-6.8.1-r1 (04 Feb 2013)
 
diff --git a/dev-util/insight/files/insight-6.8.1-automake-1.13.patch b/dev-util/insight/files/insight-6.8.1-automake-1.13.patch
new file mode 100644
index 000000000000..3211c1b40a03
--- /dev/null
+++ b/dev-util/insight/files/insight-6.8.1-automake-1.13.patch
@@ -0,0 +1,123 @@
+From a38e3fb554ceeb9b50ed576f45893b01bfc993d8 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Sun, 3 Nov 2013 18:03:05 +0100
+Subject: [PATCH] BUILD: fix autoreconf with automake-1.13
+
+cygnus flavor has been removed from automake-1.13
+---
+ bfd/Makefile.am               | 2 +-
+ bfd/doc/Makefile.am           | 2 +-
+ gdb/gdbtk/Makefile.am         | 2 +-
+ gdb/gdbtk/plugins/Makefile.am | 2 +-
+ libgui/Makefile.am            | 2 +-
+ libgui/library/Makefile.am    | 2 +-
+ libgui/src/Makefile.am        | 2 +-
+ opcodes/Makefile.am           | 2 +-
+ tcl/cygwin/Makefile.am        | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/bfd/Makefile.am b/bfd/Makefile.am
+index 8e0a79c..129270c 100644
+--- a/bfd/Makefile.am
++++ b/bfd/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to generate Makefile.in
+ 
+-AUTOMAKE_OPTIONS = 1.9 cygnus
++AUTOMAKE_OPTIONS = 1.9
+ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+ 
+ # Uncomment the following line when doing a release.
+diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
+index 6ff434a..83f0ba4 100644
+--- a/bfd/doc/Makefile.am
++++ b/bfd/doc/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to generate Makefile.in
+ 
+-AUTOMAKE_OPTIONS = 1.9 cygnus
++AUTOMAKE_OPTIONS = 1.9
+ 
+ DOCFILES = aoutx.texi  archive.texi archures.texi \
+ 	bfdt.texi  cache.texi coffcode.texi \
+diff --git a/gdb/gdbtk/Makefile.am b/gdb/gdbtk/Makefile.am
+index 530ab66..1361b84 100644
+--- a/gdb/gdbtk/Makefile.am
++++ b/gdb/gdbtk/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ SUBDIRS = plugins
+diff --git a/gdb/gdbtk/plugins/Makefile.am b/gdb/gdbtk/plugins/Makefile.am
+index 03fabe7..538681e 100644
+--- a/gdb/gdbtk/plugins/Makefile.am
++++ b/gdb/gdbtk/plugins/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ SUBDIRS = @make_subdirs@
+diff --git a/libgui/Makefile.am b/libgui/Makefile.am
+index c2604ed..b99c5a2 100644
+--- a/libgui/Makefile.am
++++ b/libgui/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ SUBDIRS = library src
+diff --git a/libgui/library/Makefile.am b/libgui/library/Makefile.am
+index a0aae95..9dba223 100644
+--- a/libgui/library/Makefile.am
++++ b/libgui/library/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ 
+ ## Convenience variables.
+ TCL = advice.tcl balloon.tcl bbox.tcl bgerror.tcl bindings.tcl \
+diff --git a/libgui/src/Makefile.am b/libgui/src/Makefile.am
+index 1c42b85..8362012 100644
+--- a/libgui/src/Makefile.am
++++ b/libgui/src/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ 
+ noinst_LIBRARIES = libgui.a
+ 
+diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
+index 8cd2be1..6b2ab00 100644
+--- a/opcodes/Makefile.am
++++ b/opcodes/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to generate Makefile.in
+ 
+-AUTOMAKE_OPTIONS = 1.9 cygnus
++AUTOMAKE_OPTIONS = 1.9
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+ 
+ SUBDIRS = po
+diff --git a/tcl/cygwin/Makefile.am b/tcl/cygwin/Makefile.am
+index dd1f243..686ba57 100644
+--- a/tcl/cygwin/Makefile.am
++++ b/tcl/cygwin/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-AUTOMAKE_OPTIONS = cygnus
++AUTOMAKE_OPTIONS =
+ 
+ updir=$(srcdir)/..
+ vpath % $(updir)/generic:$(updir)/unix
+-- 
+1.8.4.2
+
diff --git a/dev-util/insight/insight-6.8.1-r1.ebuild b/dev-util/insight/insight-6.8.1-r1.ebuild
index 21f21334c5cf..710860796419 100644
--- a/dev-util/insight/insight-6.8.1-r1.ebuild
+++ b/dev-util/insight/insight-6.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1-r1.ebuild,v 1.1 2013/02/04 07:16:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1-r1.ebuild,v 1.2 2013/11/03 17:09:14 hasufell Exp $
 
 EAPI=4
 
@@ -43,6 +43,8 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	epatch
 
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
 	# remove bundled stuff
 	rm -rf "${S}"/{itcl,tcl,tk,readline} || die
 
diff --git a/dev-util/insight/insight-6.8.1.ebuild b/dev-util/insight/insight-6.8.1.ebuild
index 97d91ce59f61..b4f868f71d8c 100644
--- a/dev-util/insight/insight-6.8.1.ebuild
+++ b/dev-util/insight/insight-6.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1.ebuild,v 1.7 2012/08/22 23:23:16 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1.ebuild,v 1.8 2013/11/03 17:09:14 hasufell Exp $
 
 EAPI=4
 
@@ -43,6 +43,8 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	epatch
 
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
 	# remove bundled stuff
 	rm -rf "${S}"/{itcl,tcl,tk,readline} || die