fix build with automake-1.13 wrt #486414

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 147 insertions, 21 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/Manifest b/dev-util/insight/Manifest
index 11f220d5bd3e..bbcd7d87e2c6 100644
--- a/dev-util/insight/Manifest
+++ b/dev-util/insight/Manifest
@@ -2,27 +2,22 @@
 Hash: SHA256
 
 AUX 99insight 70 SHA256 3d2b493b8b7879f26b8189b3d424aeefa39f9eba1784b34c6741882eff9c1e78 SHA512 18d4f5c376b224568a5ea9a67a4dcc30491bee15544cc9732e570964e9c69d47b76904fa2dac99360058e1d3a15828d1158d81aaeb5e9e658a9556b210871efc WHIRLPOOL 873a98ce5b4a154a4d5cb3d080eb24660d7b50890c824b973cb28cc6e799cfc6293df1e719f78a7aa1145499cd1640b6ceb341256493bc1f6d5301767e94d4e2
+AUX insight-6.8.1-automake-1.13.patch 3640 SHA256 11a380875fea97eb379a7f9ee37ed7e68f377a85beab6bf6c58c108f3df87728 SHA512 39ac35c06eee4d0b32ad425d30ca8ee18cbd6f72821685278107d6ab312c98a2f6dd9ea4128ad8fff65a5b32f77166c8778de261ebb111a009def8a9ffb42208 WHIRLPOOL 4986d33109b5cf09bcc83416e2ff1ec9250f1d48904b742027c98491af65fffdac3a7a87516ca796264d858dbab015a3ab50d9c77d348b6475e23b3cec1981c0
 DIST insight-6.8-1a.tar.bz2 23900337 SHA256 51216df73adc4f68c67b60356270d5073f0ff094c1b477ecd96560f49707ea2a SHA512 ce9d5ea0ef651dbeda24f042417e6d30dd4734af5da6a02dfbdcdc777b44d816597c2f81a8beaf8b74cec07c38f3671fd38d9a39527d9ece899f5f3785d0254d WHIRLPOOL ea27f3de71460f40e78621878abad2cbfe94bc46cff0f741bf7401d8dfef79288748efb33271a48ad2eac026bec1a4728e48723ae19046def6501688eb290511
 DIST insight-6.8.1-patchset-01.tar.xz 324484 SHA256 54ca13a95d46941ebd25b8db2e31f6dcad9201dd0a414af296057b9fa91a9d0e SHA512 98551f1bdb77568ccdaf0217942cef2b3a4e6b5e5e6c27985ea805da54481fa680daaf7cc7331bc6f0a1c765d93fc8e2d8a5f76d4f56ec548e40406756aebb32 WHIRLPOOL d91122cb92078984d9d4904cb1d2a93d3c7485a37519b948be4d725ca0cd039dae57f419a242b466ce2224d2dac41d948afaded960559700e7c9f1ea8a5aeef2
 DIST insight-6.8.1-patchset-02.tar.xz 325772 SHA256 294c80770a1dab976d0daf1439b5721d57b0d89aa164d39f7cfb3f6c3109712d SHA512 1759e9d19115da634b3e57cd3aa6d628b2fbcea1666d5f34ce81c87d03112dc257a84c02fe87cc903fe505631310b72b0e0b60bace79932446bd1f864cf1c2a7 WHIRLPOOL 09b1681efc0d1f0a7b2c4bdaae8b80334af5db8c031ad9b8d70df77b0e272137854df4356562ad903afd285be1943d53dd2afd4b89a97cefb84e3ab4bfac6227
-EBUILD insight-6.8.1-r1.ebuild 2567 SHA256 0ab1a05842e946bdcb4e05fb78663229f58923aab8f9d41de7ba643bb1f64068 SHA512 3f057a2762f4bb6f883f825fdcd41da8df1b9052fceb5ad8c8e78b9cc9e5c4cbc7bdac3cc6306af16f5470e25a1a18e3ecca3308d4a5975ea1eba4b892632acc WHIRLPOOL 5d95f58f6fae2f3601b43b15b4d211613eaedd2234ec901f47a1d730c7f5eb6778137f7203bb454523835596970803f016788d9514895cab53c79928754b6853
-EBUILD insight-6.8.1.ebuild 2555 SHA256 b18d155f457d761be2ec511262157c272587750d49abc786f580309a66e615fe SHA512 a39613be58009593f75c2f785626e1478baeec96c62b0cb2c8288aa1f3adaed43aae6eb18f63202d310acae603d1da4d2a77a6591226f3b36f94b56da69aa4e1 WHIRLPOOL 1db0caf13e0f8735c3489879ae491a4cef2b05d26caa922d3f106fd6361b84a5ea97277d2948a1e42cdcd01e50094f422a52218a980e809e9c9a14f03fba34bc
-MISC ChangeLog 7033 SHA256 0d0ae6ddc7292198898a5ee70ad141d61172a40d8bb912823233b76036ff9da9 SHA512 973a803c9477e958619bde4de6049725a590e158225e9c3facc4738f4b66cefa929413b2e5d3b4b73a633b17ad667b8215c9da2e0e6b473e0f3c4aa8351ae0af WHIRLPOOL 069f084f2f9aa7d05a36d57ff9959eda581ac23909969adfab5d83b66d4d3988c6ad09b36572291b36c8121ba01efbf8a2e8e382eba5ec504c56e19523e79070
+EBUILD insight-6.8.1-r1.ebuild 2613 SHA256 ac6fbe237d1e28eaf7f6da9afd36627a4984b5cbf0cef8ba3d304e741b1a2275 SHA512 6ac7f1913f9e34fbb87e6239ae77d5dadb4e72454117501554d27c6a0af39bcc0784e802703d46f96763b7d8df5b4480032790ad728006140918fead002ad28c WHIRLPOOL 9b4958d95736b48eb04177845e667813af61783f3d2341e3bd49bd9aed17c7828b5fec4346c0e0ec515b46ec3999864488ec2fbfb979e66421a6dc8ee20970a1
+EBUILD insight-6.8.1.ebuild 2608 SHA256 c0f44deb83d5979696cdfa34e0ad2864b450c5d1ab4b4cc2b9dc78281d02c7e5 SHA512 56df15d50104407535d37f1c528c32ac0a30dae14fbe7a61990c942b0cd9389e3e305271c772d7d1427ac138dad88a1158da06fb1bd3b754c8d803d7a74e317e WHIRLPOOL c1d48129ebb704a3fe3a76e008914af013da4d0add27e52541260531689b06b331b352cd19cd4214f8fcdc5c3cbb3f244fade6dd26823017068044aebff2223f
+MISC ChangeLog 7217 SHA256 4cc98cbffb77f3a9db6b795846d1b01d4acf3e09800586746cfb3e7d7a2afcc3 SHA512 c17c7fe8e159511266c2e70cb70eef935eb6b53125e957e5bfac98101087e223d836dcd5ae7c2b6e79175f714e724e0b158769d5cbbb4e5be4a657801d3689d5 WHIRLPOOL bec11ecab41bc654e75e8b3a029a07ceeae9b7eebd23d459f658c62b1178fb636ed2dd99e02d6bc5cba63965b461c9c5d2860d92e89cab2f773e85402d7c1e86
 MISC metadata.xml 224 SHA256 402a4bdf76ce631373abcd73bef4bcebb243ecd1af6311eedfbaac26d0a166f1 SHA512 76268da5ee53c624381e9d6a7288ad0aa4b885db9db0577bc248f207082938a704b01b68907072defc04ab0d4bc368da3019e2b3bf919999b538e8454d0bdd30 WHIRLPOOL 4298da7ccb284855eaf7697dbeed88910bbea313f82cb2b37ad9db725c0b979305cdcd28ed511e36bbfbc74f400dd00cb0b6fb10a135049b800d74997baa126c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRD2BVAAoJEF0huFKJUZL5L2AQAK25B6apd4tnEpCHowrr24mk
-sU/qvEAkPbr5KzIilpXMlfHKvQH5WVXP3sdnfZ9onWm04K2dN3uytv0QLJ5fzlpF
-XaLLiXIUHQUwlJmnpidAbkVBdzMh3xhmDhdJhObW2FOeIpXic0O5zB13085kJMep
-oV8ByccB0U6cGrsHjGevNAtXXgn71JI4Af+o0BwQikHbWV7yVku6jLMZRJUmAliD
-6RC39OKcIQz/pze5iyqPjRt2m0QM63KFYayDpVul4y6pht/yA8cmac6eaLNE5ilu
-xQEas07TiY5zMyYhg9zcEb1mJvA9SprY7Osd5MPFsbJ5FucXFwJDYmLMp+wEJIWe
-9fjkd3XM15p/32REjoCXrzbrWOeZ5UURfzKwVvZjcomV295jlNt5MsxdMzDdQ71t
-9rWh3apgOVLEXLofsyIg4j0U1sz1st4/3stJUKo3UwP+aUJRfdaVASbGh/92ratM
-77M8l0sszWIsOGlHrpW5HRN5LsCN8CRkC0NFuTyx2foCdzbzF31buUHr5i1dIXUt
-/fAp/Xi37OoNElEyIyvor6jqH1J+Y/M5iJOqt4tAF2wbQxM/9zlYv/y1aPTLpxD8
-/uNd88jMLE4b+Bjk3yEJHLLpRCPXafMw7yNJgJZxG4Wog3WZosqTVy3i2K1eRNNT
-vbHhC1/Dci5r9ITPAiJd
-=BTMV
+iQEcBAEBCAAGBQJSdoNAAAoJEFpvPKfnPDWz4RMH/RX3HP1uiLvozRdqkR1UpCle
+KCvKUdaYOoANQSzcK4vLsJUQDRwXJLxq2gUFEaEs38l6znfC2U0hLbIG3PB7WwCG
+tCrF4L9PSzVd5dNCnqvnfNv3KN+YNNFwcIEaXry9q4YxngkHhyeiWtoyNF3zfEH0
+3/Sd2ZF+twXR8iCrqWZdjUQLDjgXwyrQ022xlJvfDdHwInd7GNTl5RoQT6dF4c7m
+nr5lMdgThPG/NAuQtD6BD9zzirFl0UpfN8lQ6U2vusGfIUlMhPhFBio4zvPE/t91
+jJ4jA3eeArflpxotYDnsohiKC3lNZAivUUsqIP9djIALtb0/QN6jxsq9ERXGqUM=
+=JtMj
 -----END PGP SIGNATURE-----
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