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

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 30 insertions, 11 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/Manifest b/net-dialup/lrzsz/Manifest
index 7c72d1e4385f..6a8faf7f0e43 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX lrzsz-0.12.20-automake-2.12.patch 793 SHA256 da14545c343544d9c35cb20d9574f1f16cb39a057be1cb0af79998a5c0960455 SHA512 8e55cec506a494f97e7bd0c7bf910a0f49ab56485fe916e6d9e7dec7c6ff0f14aadd2b88d393ea16493c1780405e69ec7876490bf93fd05a8c51a3f58666a4a0 WHIRLPOOL 2494d8e15ee9d08f1001f512fca0bbf13646aead8d73100a003d56c99954fff133ff3c475dd13d458d8eca035949ee0c4c9d4d4f590f72fa55a7c6dbd9c8be6b
+AUX lrzsz-0.12.20-automake-1.12.patch 793 SHA256 da14545c343544d9c35cb20d9574f1f16cb39a057be1cb0af79998a5c0960455 SHA512 8e55cec506a494f97e7bd0c7bf910a0f49ab56485fe916e6d9e7dec7c6ff0f14aadd2b88d393ea16493c1780405e69ec7876490bf93fd05a8c51a3f58666a4a0 WHIRLPOOL 2494d8e15ee9d08f1001f512fca0bbf13646aead8d73100a003d56c99954fff133ff3c475dd13d458d8eca035949ee0c4c9d4d4f590f72fa55a7c6dbd9c8be6b
+AUX lrzsz-0.12.20-automake-1.13.patch 454 SHA256 e25ebcc294beb5628e9801142a5dc4efb3ed1590f9afb89512cd0e51d2db5a72 SHA512 75b0f707704bb4f788de9f2fbb82c29daaa4b748e151271ba2617d24d759a84dea323f2f160b727e2c94675df78ffe1bd8368dd593d4582cbb567643717ec68e WHIRLPOOL 866e2c9300e69e44948bcc2537e8726148cbb06fcf1a4eefd0fbf9437853a740f8ca1e9d0299df6d557481f88b155c8ddf928edefb0e6ef384367117065894cc
 AUX lrzsz-autotools.patch 8725 SHA256 05efb70cbe0a72a4ff3bfc89f9af05c79c215d7b4ffc7a883cd8ece56e605eb2 SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909 WHIRLPOOL f37457903b0fb0638401edb084aac1ca64bb7e41473c8e25c624c3b0ba363d26b1b61a0334db67f10225696e5e69a0464084ca2a5ce3200ea9e17b0af4773d7e
 AUX lrzsz-implicit-decl.patch 428 SHA256 867e4dc69fc83d0f96bb46d11d44b9575106e199506cf7098be0a5d2d9e39d81 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7 WHIRLPOOL f896657ad15689eec5d586e2b2954d32bed9a45583b1c545a80c5a97d4ac1f16cdebbf5232630c5480b55ae71eb841cace4701cbc095eda36809516387480d0c
 DIST lrzsz-0.12.20.tar.gz 280938 SHA256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12 WHIRLPOOL 17934730db44d11c08b700cd68d8a1e619612bf158db106ef8e7fc54e623b0c5e98a133870cf8cd0b8f824c3cf24b24f7102725dcf438d307a2e1d3839e0d1d5
-EBUILD lrzsz-0.12.20-r3.ebuild 1742 SHA256 d0ec4c623554112028425d22625c35adb1268899865d3ca4f4caa16a7d2bcf18 SHA512 d730e64b514d0d637773a41eae2bcb9cfc11025343ae7d69f417541deb8926bc91f4d9073522d03d9d2908f628fbcbd5965d57221f0ef150e84854bed2fcd835 WHIRLPOOL d3ce895586c722762a45405b8b44d5889ba213d262c9901558abe957f0e2d327dff085bb45ac84c674b1b0440112b7a7f40aaec3113a33a281ba72bfa2da9622
-MISC ChangeLog 5971 SHA256 a1f8470fa7b5695510a299b7dd5c337557277fe63e0c18e462a03e5e2c42d429 SHA512 fd4be14fa68fdb3f0c6d8f5fa80400812c324e19e7f7517ae1bb41687c94d4ee6951686bafa1fa8463df9c836292ad918e140675881ea1cb5a082b24085a7731 WHIRLPOOL 5134c9a8a5da2e62d0bc8da3b4680766eb79c2dee8ba170f449ecdee5f5168d70c91da6213d97f4fd3cde170a06f0016388d35cc2a9b7287304aa73ac1982433
+EBUILD lrzsz-0.12.20-r3.ebuild 1716 SHA256 f8ab2ba5c59d2bff353dddbd596b1dfc644979d04ad6d9f83b28b9e6da66e276 SHA512 ac15859bc4624bfa13c2f871755ffc54117d5c7f024af9017a7b0a70e9739722bad133c87d94955307d39966fae041cfe87f3911d048cfcdb3e7e7e8b9544c33 WHIRLPOOL 3bbdaafef57a98969426aa52780ca1f0774c6ec30f067cacc588cb04160cb4912fbad7d322a242cc5bab22cc9934df8e250ab2ba95b87b57334c5ef959bf4ef3
+MISC ChangeLog 6301 SHA256 12958ef287c4948853f8483f978daf9cac2ab5cd07c28324eee0de201ccf11ec SHA512 3df437daaea450dde7374b02176ff104df32409d6609a593e8f3730351f775a3ac615220e0684ccfb5939b7d0c2ef9bdc75d9e49b63fea04d0f5d5301eb5ab2a WHIRLPOOL b0364f29c1077c9736f7c7c2ef398b9199f98cb68633fd3ae58be45a285edd1f791eff1de31c04649b722b4637a2e20becf3f2fb11a937457def7277c783e0a3
 MISC metadata.xml 275 SHA256 e398d119aa44aee1268aeba20f0ff50ce658a9d0011d476c9f3f7e060aac3d0d SHA512 71e87aef3131e0835223a9deca5ffeff8fd5e18d5ba2cdd2d53a9faf07c6e41d8a8131637d77ff77f52ebfe0493f7aebd870082627e69cb966077032c17af256 WHIRLPOOL 72cb28b728a06068fcdab9120951db2220420a914d7c004bf7a5b3929e235ef3ce56283777945ba13192a0c0cbfe76e27255f1623d19402fb8b11da653e29456
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF6naMACgkQVWmRsqeSphOJEACdENrhLRlXsQ0MVUfdSy6XydT0
-D24AnjjmddvcWgkKwdpqzquJV0IE0keM
-=UUCn
+iEYEAREIAAYFAlF6nycACgkQVWmRsqeSphMqzwCeNH+uLsq1j1pf4vP8j90tgAI3
+4qwAn1Qp9fsnyEnVbRsZVpD64FyZziz9
+=n9p9
 -----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-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
 }