Fix building with sys-devel/automake >= 1.12 wrt #423125

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

3 files changed, 31 insertions, 30 deletions

diff --git a/app-arch/lha/ChangeLog b/app-arch/lha/ChangeLog
index 90db2e755ac2..f74d4a7dc1ca 100644
--- a/app-arch/lha/ChangeLog
+++ b/app-arch/lha/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/lha
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.49 2012/03/05 20:10:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.50 2012/06/24 09:56:04 ssuominen Exp $
+
+  24 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> lha-114i-r7.ebuild:
+  Fix building with sys-devel/automake >= 1.12 wrt #423125
 
   05 Mar 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy maintainer
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index 70bf7a68738d..1cec1cfdfdd1 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,25 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX lha-114i-file-list-from-stdin.patch 991 RMD160 6a7dfece767cfa8f3dabfddb06f591450c560c06 SHA1 a4936b46747f91916c7eb7e64fe6be7ea5c4420d SHA256 f54adeb588365f50ec81b590254260254e58100a936e0a096c5f25964f9afd8d
 DIST lha-1.14i-ac20050924p1.tar.gz 285518 RMD160 7603dc93d8afdeed6cfbaa193f68ae4283bea39b SHA1 2491c8b584c21759f1d3819f57fa0e1cbc235092 SHA256 b5261e9f98538816aa9e64791f23cb83f1632ecda61f02e54b6749e9ca5e9ee4
-EBUILD lha-114i-r7.ebuild 1040 RMD160 aaeae115e7d6a38c108051df6d9ab402d5034633 SHA1 6f3a4bc3d3dff94b038ad6268a6cabee330cfd48 SHA256 ea71ff28eccd194286bc733c52aa9a0f25d2f217181f919f68db257b918f0a44
-MISC ChangeLog 6386 RMD160 5d4d4b18d6844475ec5b311b43c94266039f273a SHA1 f597f4311b3885b57a4d5555c300303baec918a1 SHA256 0024dc28270bc35edd5f39ec669688ed520895d07c716ae85d4b8760bdd816bc
+EBUILD lha-114i-r7.ebuild 1115 RMD160 151110d968ab224bcb8f1e62c6749b316f2dc5f6 SHA1 1d4ea78c913809eeebf711003f635230a33e6e17 SHA256 5eb063ad535e461b4ea1d2596b593e1ca370a2a38a9636b88190413383e916d8
+MISC ChangeLog 6521 RMD160 940779fe58500e6d7364e77de7d7e2b984626cd4 SHA1 10b63cfe45aab6ecedc5d7b37aa21ce5bf73cf32 SHA256 de8fc82f7389cee9ee2902a872216888fb1beef2b165f51d0836fc4bee764fa6
 MISC metadata.xml 359 RMD160 af30713a2171632a12943310fbe078240c251261 SHA1 21af693227991fbca53b1c97042628585d57cdf6 SHA256 52a548996aa08dcd6e5844f209ce3429da26476790b79352bb83ba84471d26f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPVR3NAAoJEPqDWhW0r/LCy5gP/3F0CPR/0vYHjv0n3NgjcpjL
-sEGVE4jP4vGrru6p7M2yf71uZofqJNVVjybEfoe8Il1dC4SdZHFXLOfceiu/P0XH
-Q0naBgvUmH1OI+/H5tD/2FTl4HTCWzqwWBQOpQI5LCR3Hw1oxiWViScbo4BznmHL
-msHYpwE4BHvfVYJbUbzVXm3bUq5x5+k+MIzNdjPgYRzxBonXdcqjQ1ECgKQdyLYA
-xlU/ySCkclu/7ZCZTdOKeNBgJweDzlMgLodM0es9VJdcZDsRmEKd3gXvdZm1Q1LH
-yBYPmTJ/7jHkxvKpBly/rxecpyVkXiLjPR/P9bVH0girMVdVEkq4jLTCvhQozbu2
-0vDk7V+OLSncUhmtv5hfwS2XeMG4EUHuoYaDwivTddmFGDPG3NEB71pVOVRKO9k8
-vBOCDgByGqELPXPpv8LtOh+n6YqLOEXpg1NjDzHX5HJYXs/duR4I+6jd+StH5Aif
-LnV1n/pE2J4vDhf+d8KJNBBGF95RXpDWxNyTV62SmFLZMwAn50mHGWSi4g2myqRf
-G0R5eKpokYuBE6kcHuuGn7RRiva9Ss3yyCxaeIBvG1m+an5yq6AxrW1ZPT51gzhK
-dn0ElNooYCrijC8VMSyZUOu9mSipoQGmYNrZSEP/lbOUprikuqGjnjKBmclIz+aA
-vJ1AqwiYQwcP6QYr7sYm
-=Vw+p
+iQEcBAEBAgAGBQJP5uMLAAoJEEdUh39IaPFNn3kH/0CGnWh7FNSlSip676uQOKqY
+hEG83c3J5KkJqgJFQkkKs9HJ1gJuSeiOwHnTCgbf1XNVE88vbqdGApjfhlxD3K7x
+OYACR8rYNjvikTh25L5wtZeK1EXUDmbhjfJZ2u69RB3qt6bzZIh4lkrZ92j8N12E
+5YvzRbJqnNUYxRH/trPpneCk/0onxAoHP78ehySrztMejMsTPOvA3Z6Ge/KOwJKl
+XqddzMRD08GCJv163+1PsgiyqUsFhSgQHfS8z+Ttd6FzkWiriLzuZ9T9fp8nnhl7
+jFmRIBVzmwtVVwisCN17ZzoujfwHn7V6TYBjygUwdqiPOCZttxq/akM+PLpADyE=
+=6sf+
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lha/lha-114i-r7.ebuild b/app-arch/lha/lha-114i-r7.ebuild
index 70465d70c3d2..8ed10ad8ebb4 100644
--- a/app-arch/lha/lha-114i-r7.ebuild
+++ b/app-arch/lha/lha-114i-r7.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/lha-114i-r7.ebuild,v 1.9 2010/04/06 05:46:49 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/lha-114i-r7.ebuild,v 1.10 2012/06/24 09:56:04 ssuominen Exp $
 
-EAPI="3"
+EAPI=4
+inherit autotools eutils flag-o-matic
 
-inherit eutils autotools
-
-MY_P="${PN}-1.14i-ac20050924p1"
+MY_P=${PN}-1.14i-ac20050924p1
 
 DESCRIPTION="Utility for creating and opening lzh archives"
 HOMEPAGE="http://lha.sourceforge.jp"
@@ -17,27 +16,32 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-file-list-from-stdin.patch
+
+	sed -i -e '/^AM_C_PROTOTYPES/d' configure.ac || die #423125
+
 	eautoreconf
 }
 
 src_configure() {
+	append-cppflags -DPROTOTYPES #423125
+
 	if [[ ${CHOST} == *-interix* ]]; then
 		export ac_cv_header_inttypes_h=no
 		export ac_cv_func_iconv=no
 	fi
+
 	econf
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
+	emake \
+		DESTDIR="${D}" \
 		mandir="${EPREFIX}"/usr/share/man/ja \
-		install || die "emake failed."
+		install
+
 	dodoc ChangeLog Hacking_of_LHa
 }