Fix build with automake-1.14 (bug #493100).

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

4 files changed, 34 insertions, 11 deletions

diff --git a/net-analyzer/netcat6/ChangeLog b/net-analyzer/netcat6/ChangeLog
index e398755f71d8..ed8adee9fd7a 100644
--- a/net-analyzer/netcat6/ChangeLog
+++ b/net-analyzer/netcat6/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/netcat6
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.32 2013/04/24 14:37:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.33 2013/12/04 03:21:59 radhermit Exp $
+
+  04 Dec 2013; Tim Harder <radhermit@gentoo.org> netcat6-1.0-r2.ebuild,
+  +files/netcat6-1.0-automake-1.14.patch:
+  Fix build with automake-1.14 (bug #493100).
 
   24 Apr 2013; Jeroen Roovers <jer@gentoo.org> netcat6-1.0-r2.ebuild:
   Do not call ar directly. Fix building with automake-1.13 (bug #467014 by
diff --git a/net-analyzer/netcat6/Manifest b/net-analyzer/netcat6/Manifest
index 58eaab787ff0..c1cc2f522304 100644
--- a/net-analyzer/netcat6/Manifest
+++ b/net-analyzer/netcat6/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX netcat6-1.0-automake-1.14.patch 440 SHA256 fbd13e59cf593e6b7f38397534375170955c06e40c45d1d4a1a7867703048bd7 SHA512 08964fad2304f9b5f4f00f58937d3c8e7c5486d9d221cbbadbd84dc97ef5832076f27a1e15a5801901855b3719a09f92f397a089a2bade99603414844a2c6e84 WHIRLPOOL 1a207e9a97dc548824d6403b2ac3509139acb6b23eaaa2f5b0633564b4e4977bae801f6d69e7dbf9242a3dc3ff0e72591e5bdd54b4ee7860fdabdd8ae7091ffb
 AUX netcat6-1.0-unix-sockets.patch 8798 SHA256 c82d3ae349d7cf142a839066fef2fc1f98903260cec6e30d08aca375487a5c7b SHA512 baa26599f55c36bccb6e26d9b79ac6516e862df6209939547adc32303b2833ec87d9ca08d1be8e08fae033062b4b5bba8c723eac4e2fc6734f1882be92914fae WHIRLPOOL f02d12ba65a2b2077285519327cdd192d2964ad614ff994f65af696c90296819f52755d758f9b3b0c8954376fe9f8dcb387ee9378cfe6a83f9b6a668a22ae616
 DIST nc6-1.0.tar.bz2 264257 SHA256 eb35e7a05a60bf94496075a3a246d7bf63fcdba2ca7ceb6844852a1ff6478206 SHA512 199f3bd18bb452544da8ca1b0f5347f79662bea81e9af335a41ed62c12d5d8cb41d99442ca54f301538d27aec4ada5f59db87461e5b0f20333ba1b52859bd35a WHIRLPOOL e3ad61617daa705efc4a459c96a6e020eb30d6e38be367c5014fa2b8706de53502348ce6995e7804c60e6c4b8cfefc21a50a00987cdb33b9ae2d336d294bbf80
-EBUILD netcat6-1.0-r2.ebuild 1236 SHA256 fc19e860b2acae618db232e1b8a1e6cfb9c63a1d2abcf6ce1c01087452cba336 SHA512 b6765ccc5cd1862ffc1e1c8d0a4534a7a3fd0da6d6a3f5789c8b9114f50e4e08ca94ee4a809c19941ba2ae4fca9ff7dcb5d9d82c9a7f2e619e45d2f118e432c8 WHIRLPOOL 52fe1f4f6315d4f7ab71461037696d0ac64656b96f19105c874ee64a989e812197f75adf99b5f7df18136681e7aa5b9d2cf1fb90123097d16ee5de2d0cbdf919
-MISC ChangeLog 3955 SHA256 13dcba0c360a9078187a440178146cf71d46f9f14e9b8e9cdcc6e882f3033b0c SHA512 e2afac4eb88f017e96d7f2966e8291441729b291ab946f0e978ac2680cdc890f41529647fdca55f917c853b57b3584068bbf831b7f4903c668953e70fd39cbf5 WHIRLPOOL 7bcd06ac8b9c90b439ab40eb6a12a3734531c75006c37c16d73d37cdb1cde1afbb24745232221ffc7431192c37589016d8e9b5e3d54d1d7ffbf88c7c1dd21ccd
+EBUILD netcat6-1.0-r2.ebuild 1242 SHA256 058cc70eee6d841a32cee8974626986f2b8086d974544cc9c059859e3b7573bf SHA512 368f78953888da1c247185202dfde86ef6e1e0ec9ee5a06d54dd5f22b64775758db3797cf7076fee7f2671be76553ae8a3c999dce2712a509d6cf7e6424faf18 WHIRLPOOL 6d75d7a860f5e982778d9dc59b308bd5f87472db1b1992a101282af99942b94818fb346424d9df566cce132787ffa5f706dd6347cc7980869be5a41f772c2723
+MISC ChangeLog 4122 SHA256 7b257836a87998ddde2a9b62a11f80c3af1543b08dc5bd7b56e157597af1fb02 SHA512 76db3d3211336d45764f929b8e3b1df23d9f80de50e9e9a500b139415beef7e8786ae762bfac4f5f2e3f024b564d7fe6cd49f8692137efe198e8bba5cdebed69 WHIRLPOOL 8e0b2f84a5764fae6ce6340d9e27c8738c0b775a2b4c65ff4f3b96de3875f0496b932e2fa50b7ec12d3acd326a0028f5d072ab20c87c81f0b354ee9c19efed89
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlF37kUACgkQVWmRsqeSphNjIgCggOn6zsgzDXCcWVoLsduzwhtj
-JKoAnA1+RK2SY6BD9oHz9MWFv0r6mUMe
-=M5P1
+iQEcBAEBCAAGBQJSnp/aAAoJEEqz6FtPBkyjaHwIALmt3CCR2qIZS+QhOEgGQMzI
+tevnPh0pMIGGanMp7659AUsiMAiYslgk1PGCs2azSqfIcRhkPWu8RXKtBrRzoeDi
+yP3XogS+ig4Kml+XghIKaY9xrUSa5KvTjzv4stqKGINep1RbYOBiBcP42g4uda8J
+cI0iOppUwoJxLqGbnEjBREC3BTdkLbm3m3jl+1MhMKKsJFrin4L80j42iROPyl29
+tvbUtGqAkapTFW4ws+GZtDVd/6fEpVx6b9hu8FIInRKu5V0+J19s2ZlqWGom8GJF
+lJ4au2uuOh1fFT6QHUreC8P+0SFgpudLXkJBfZv7mtk9jt3wWysdSPsp++t0Q0Y=
+=aUn3
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch b/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
new file mode 100644
index 000000000000..2e7dcb6b0849
--- /dev/null
+++ b/net-analyzer/netcat6/files/netcat6-1.0-automake-1.14.patch
@@ -0,0 +1,14 @@
+--- nc6-1.0/configure.ac
++++ nc6-1.0/configure.ac
+@@ -2,9 +2,9 @@
+ AC_INIT(nc6, 1.0, [ds6-devel@deepspace6.net])
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_SRCDIR(src/main.c)
+-AM_GNU_GETTEXT_VERSION(0.14.1)
+ AM_INIT_AUTOMAKE(1.6)           dnl Automake 1.6 or better is required
+-AM_CONFIG_HEADER(config.h)
++AM_GNU_GETTEXT_VERSION(0.14.1)
++AC_CONFIG_HEADERS(config.h)
+ AC_PREREQ(2.52)                 dnl Autoconf 2.52 or better is required
+ 
+ 
diff --git a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
index 145f951a153a..99725a2ba968 100644
--- a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
+++ b/net-analyzer/netcat6/netcat6-1.0-r2.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/net-analyzer/netcat6/netcat6-1.0-r2.ebuild,v 1.12 2013/04/24 14:37:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-1.0-r2.ebuild,v 1.13 2013/12/04 03:21:59 radhermit Exp $
 
 EAPI=5
 inherit eutils autotools toolchain-funcs
@@ -24,9 +24,9 @@ S=${WORKDIR}/nc6-${PV}
 DOCS=( AUTHORS BUGS README NEWS TODO CREDITS ChangeLog )
 
 src_prepare() {
-	epatch "${FILESDIR}/netcat6-1.0-unix-sockets.patch"
-	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-	eautoreconf
+	epatch "${FILESDIR}"/netcat6-1.0-unix-sockets.patch
+	epatch "${FILESDIR}"/${P}-automake-1.14.patch
+	AM_OPTS="--force-missing" eautoreconf
 }
 
 src_configure() {