Use patch by Shunsuke Shimizu (bug #467330) instead of sed script. Rename automake-1.12 patch to avoid future confusion.

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 23 insertions, 5 deletions

diff --git a/net-dialup/lrzsz/ChangeLog b/net-dialup/lrzsz/ChangeLog
index 17361817bf4b..f5e42d7dbd92 100644
--- a/net-dialup/lrzsz/ChangeLog
+++ b/net-dialup/lrzsz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/lrzsz
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.31 2013/04/26 15:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.32 2013/04/26 15:37:10 jer Exp $
+
+  26 Apr 2013; Jeroen Roovers <jer@gentoo.org> lrzsz-0.12.20-r3.ebuild,
+  +files/lrzsz-0.12.20-automake-1.12.patch,
+  +files/lrzsz-0.12.20-automake-1.13.patch,
+  -files/lrzsz-0.12.20-automake-2.12.patch:
+  Use patch by Shunsuke Shimizu (bug #467330) instead of sed script. Rename
+  automake-1.12 patch to avoid future confusion.
 
   26 Apr 2013; Jeroen Roovers <jer@gentoo.org> lrzsz-0.12.20-r3.ebuild:
   Fix building with automake-1.13 (bug #467330 by Shunsuke Shimizu).
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-1.12.patch
index c5ecdee208d0..c5ecdee208d0 100644
--- a/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-2.12.patch
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.12.patch
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.13.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.13.patch
new file mode 100644
index 000000000000..a0d67c9f014f
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -urN lrzsz-0.12.20/configure.in lrzsz-0.12.20-new/configure.in
+--- lrzsz-0.12.20/configure.in	1998-12-30 16:50:07.000000000 +0900
++++ lrzsz-0.12.20-new/configure.in	2013-04-26 18:53:29.020100620 +0900
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(src/crctab.c)
+ AM_INIT_AUTOMAKE(lrzsz, 0.12.20)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ 
+ dnl AC_C_CROSS is in AC_PROG_CC since 2.12
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
index 0fb47e6e3887..5ac66fb1fd38 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-2013 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.10 2013/04/26 15:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.11 2013/04/26 15:37:10 jer Exp $
 
 EAPI="2"
 
@@ -21,7 +21,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-autotools.patch
 	epatch "${FILESDIR}"/${PN}-implicit-decl.patch
-	epatch "${FILESDIR}"/${P}-automake-2.12.patch
+	epatch "${FILESDIR}"/${P}-automake-1.12.patch
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
 
 	# automake is unhappy if this is missing
 	>> config.rpath
@@ -30,8 +31,6 @@ src_prepare() {
 	# Autoheader does not like seeing this file.
 	rm -f acconfig.h
 
-	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-
 	eautoreconf
 }