Fix build with automake-2.12 (bug #420691).

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

4 files changed, 48 insertions, 10 deletions

diff --git a/net-dialup/lrzsz/ChangeLog b/net-dialup/lrzsz/ChangeLog
index 71ea3d8391ce..08ff9f547bba 100644
--- a/net-dialup/lrzsz/ChangeLog
+++ b/net-dialup/lrzsz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/lrzsz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.29 2012/04/06 21:55:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.30 2012/06/13 22:43:43 radhermit Exp $
+
+  13 Jun 2012; Tim Harder <radhermit@gentoo.org> lrzsz-0.12.20-r3.ebuild,
+  +files/lrzsz-0.12.20-automake-2.12.patch:
+  Fix build with automake-2.12 (bug #420691).
 
   06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #63588
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 164cc8a5ca28..1a43be6d5655 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -1,16 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX lrzsz-0.12.20-automake-2.12.patch 793 RMD160 947ea288ec1c5f7deff0d29c1659cb38b575813b SHA1 9508f376a19d92a412c7cc04f37dac5b19b29058 SHA256 da14545c343544d9c35cb20d9574f1f16cb39a057be1cb0af79998a5c0960455
 AUX lrzsz-autotools.patch 8725 RMD160 cd412af32da57aa473c9b0f5c32d5093e5c9978b SHA1 45d66c975540066f7fe7e8580d7b9724a269ec0d SHA256 05efb70cbe0a72a4ff3bfc89f9af05c79c215d7b4ffc7a883cd8ece56e605eb2
 AUX lrzsz-implicit-decl.patch 428 RMD160 c069897a59d8f9a92fe820ce04ed9e9f7f6372e6 SHA1 6fc1296fca908c0b02c9078a53dfd929c02c7446 SHA256 867e4dc69fc83d0f96bb46d11d44b9575106e199506cf7098be0a5d2d9e39d81
 DIST lrzsz-0.12.20.tar.gz 280938 RMD160 1b1776143afaff8bc7447ce998f9d3a958d51f25 SHA1 451e6a1813dfb71a412c973acd1b88b9ee3f28c4 SHA256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1
-EBUILD lrzsz-0.12.20-r3.ebuild 1628 RMD160 467faf14fc4aa0ecf252b1a55194eb4fcbf0194e SHA1 0792336531ace6a419e9911a7bdeeeb574205fac SHA256 f8ed3ad3765559b2ca8172fe44e60bcccd8c592efbc8cc7b29bd0095b93a3ea0
-MISC ChangeLog 5666 RMD160 a459f9b71d23d4091375b1fa0427d58ddbe24271 SHA1 b12f296958b14eec4d2c9f921c0c47c114252de0 SHA256 f0afa29005acad5ca536f985155cb227ba1bb544f7f39d5871c2141743aadd0c
+EBUILD lrzsz-0.12.20-r3.ebuild 1674 RMD160 f9bb03d2bb456a6134e0768e2edf06cec32d6371 SHA1 d5caf54e51fc0f20fcd2cbf5fd5f98700838c536 SHA256 3947f99c4d1af1d41205120fc5d1c7d11538920f5ad9a2aeaaa79cdf36d11b37
+MISC ChangeLog 5835 RMD160 27af5973a8314ca780d0b7e49bcfed329f6bd0f0 SHA1 049c7f648ced953b195db2b6ce7f04e64cdf31c1 SHA256 923ea82f875dd773a1e46f04f976bd5cf51cc56c37267d0b156df882a17eb972
 MISC metadata.xml 275 RMD160 6648d8c096e58d3235c44259076e205481e55fde SHA1 66b8e316da3e302e0e6e53602274c6bdcb913051 SHA256 e398d119aa44aee1268aeba20f0ff50ce658a9d0011d476c9f3f7e060aac3d0d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9/ZkkACgkQCaWpQKGI+9QfXQCfa69jlYDTytriWPsEPAO5tfX1
-KREAmwZd/K0jwzjzAO2I9mRpA/C+ARoe
-=Xis+
+iQEcBAEBCgAGBQJP2RekAAoJEEqz6FtPBkyjglwH/03okZGu+AIBgwFIdObleezL
+mS8fgEFJSg2gwV4QN8D74ahzjWTu9zj0d3SuBSxaf1p5PuDFj8VRKaiKBLLknIx8
+51ZJEKTjhOs11lSBVWg1dJ9XydLXYeBQc4E4/tAXsThhCPRXopIp2z8QvDI8ksG/
+Lisdqa79hK08efjiSO2aGd5JNkomxaTE3b63BZRFxNyf7oGi9BItZboyR70JrZkw
+cUL9smYtQt+XbC+qG8VmSUGGgjbjefFzSBzFsHGJwdzVm7etzskKmwWEJ2ujbbtY
+WgHG+i2HlObR/Et1y6DhZStiu86trRz0eG143qpaiTJsjtyiehwk+cetBUQsvts=
+=lJpC
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch
new file mode 100644
index 000000000000..c5ecdee208d0
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch
@@ -0,0 +1,28 @@
+--- lrzsz-0.12.20/configure.in
++++ lrzsz-0.12.20/configure.in
+@@ -97,7 +97,6 @@
+ AC_ISC_POSIX
+ AC_USE_SYSTEM_EXTENSIONS
+ AM_GNU_GETTEXT
+-AM_C_PROTOTYPES
+ AC_C_CONST
+ AC_C_INLINE
+ 
+--- lrzsz-0.12.20/lib/Makefile.am
++++ lrzsz-0.12.20/lib/Makefile.am
+@@ -1,5 +1,4 @@
+ noinst_LIBRARIES=libzmodem.a
+-AUTOMAKE_OPTIONS=ansi2knr
+ 
+ EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
+ 	getopt.c getopt1.c mkdir.c mktime.c \
+--- lrzsz-0.12.20/src/Makefile.am
++++ lrzsz-0.12.20/src/Makefile.am
+@@ -7,7 +7,6 @@
+ DISTCLEAN_FILES=lrzszbug
+ 
+ LDADD = ../lib/libzmodem.a @INTLLIBS@
+-AUTOMAKE_OPTIONS=ansi2knr
+ EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
+ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
+ #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
index 8537c13acc09..17f343b75d47 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.8 2011/01/15 20:01:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.9 2012/06/13 22:43:43 radhermit Exp $
 
 EAPI="2"
 
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-autotools.patch
 	epatch "${FILESDIR}"/${PN}-implicit-decl.patch
+	epatch "${FILESDIR}"/${P}-automake-2.12.patch
 
 	# automake is unhappy if this is missing
 	>> config.rpath