Fix building with automake-1.13.1 and >1.14 (bug #467618, thanks to Ian Stakenvicius). Clean up the ebuild a bit.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 71 insertions, 11 deletions

diff --git a/app-text/unac/ChangeLog b/app-text/unac/ChangeLog
index 7a6606b80fef..bfb018defcb3 100644
--- a/app-text/unac/ChangeLog
+++ b/app-text/unac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/unac
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unac/ChangeLog,v 1.3 2012/05/25 11:35:40 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unac/ChangeLog,v 1.4 2013/07/23 03:19:22 tetromino Exp $
+
+  23 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org> unac-1.8.0.ebuild,
+  +files/unac-1.8.0-automake-1.13.1.patch:
+  Fix building with automake-1.13.1 and >1.14 (bug #467618, thanks to Ian
+  Stakenvicius). Clean up the ebuild a bit.
 
   25 May 2012; Agostino Sarubbo <ago@gentoo.org> unac-1.8.0.ebuild:
   Stable for amd64, wrt bug #417359
diff --git a/app-text/unac/Manifest b/app-text/unac/Manifest
index 1d01764cf825..ee2e7f8e6276 100644
--- a/app-text/unac/Manifest
+++ b/app-text/unac/Manifest
@@ -1,5 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX unac-1.8.0-automake-1.13.1.patch 950 SHA256 2a2935774d5fe273511830223eb2d091f74791db70b33bf2239f169b1781d5c9 SHA512 f6f29885b937b4e3dc21379e1e5d81229de9f1a400d24f3ea83a8cd06db822b0dc7bb8fb1dbfce27aac6d2b83834fe7fe15cdbfabfb6d82ee6311079fe7807f5 WHIRLPOOL 9905dec56daf83ab6f435617816164b6036a3c208fe474572d70af2678bcd4faede6f1526b05db641f06477f581f6c7359ebfd8316eb2924d87c74fffe72d5f5
 AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1454 SHA256 bd082bf640aa33f6a0422679b90d6a2acbf0800fe8a420030a816ed2aa7244cd SHA512 40294181f611a047c25900235d35b231e4026ff0a2759f90e3b74b0b93c97f64162803bcdfa4041652fe39421291248d189046f7e993d0a88606f4e240d04b7e WHIRLPOOL de97e1aefda97a6a5bdc626fbb5c4b7c87dc5b62025a7fd33dc55e87ca1194eebe4d813065b7e966979093ed852624eb2d967416e9604bf5d9e84ebc9dab98c6
 DIST unac_1.8.0.orig.tar.gz 281807 SHA256 29d316e5b74615d49237556929e95e0d68c4b77a0a0cfc346dc61cf0684b90bf SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8 WHIRLPOOL 50878306e85f3f78743ea416988db33ecacfeb651ebb255669bbc709e243bd575bacdeca400052b09940961b1a6ffe99d3074cc4d37786a4a6f70d9448d8d918
-EBUILD unac-1.8.0.ebuild 1222 SHA256 25cab45b52347ac46363f5bdafa816c4cc1e01942db1bc3ac09472ff00c12893 SHA512 617aba0fdb47291f3a78bc0abba2409e5bb436b8fcbbd5f61544709f79573fcab69f54f8a9f4a6b40c661da6413617200e008e0bc76604a92550ff8b3dfd9bc0 WHIRLPOOL 1573fa42097d83e71cdca0d611c6c135e1c9b0da13180b8a4e67a687ee3e59739d688c9e28396b784641b00a3ef0b2a19b781d8eacdac0ccf82566622d27c150
-MISC ChangeLog 683 SHA256 314c3c04fbce071dc71b5262908d0668e6eca73c292900fc5b6128a6021c2ab4 SHA512 87d9adb5b808335131825a9ac3bf18ff9e9c554348b5d6de77dd5d9a55d7d7d2d2ce0398f839bc3321c17e471e2c562d2c5d6aff6633561b68c4f73381853e4f WHIRLPOOL 97520b98c6bdf5f7e6624e8c8d46e339c27bbc5f975aaedc03c7bb73cbaefc40d47715486ffb672344ecbb1b0e75c8ae5e394f9c5385034719e8d9dfc878dbc7
+EBUILD unac-1.8.0.ebuild 1256 SHA256 15f09d570577e5a2010b65ec68c7c24999cbc65e94f7c52a8eaee8e724c7aade SHA512 0b111acdebbf73507d5094a3ec47dc474c3d01f92c30d8d83edff472ddf04815abf0c6951b2873043a94dcf395d36aefccccfbf85299341754514f715667d3c8 WHIRLPOOL f80794f886c50d67b82d38ec2e0ef02b2aad55e0649f0d4d7c0211a2ba8149be31174092fa012bc0b85dee8d038f91ebd40a5a8d8efe895cc57f1064e085a899
+MISC ChangeLog 929 SHA256 fc9bb683dd4c2e23e4e858b8e795d99a4b7b76b43abf6895385720333e822a8b SHA512 c8538f599cab35567e1821f1e8969ca2ddfa6ba01c8b9438b5dbf1b6756d2082e948df517dc4f40cf468c619a1d9a4afb430668a5f49a73e5b741f3e45a1cc32 WHIRLPOOL ac0cf338fcb834113ec6c96a2e9d6257dd92bdb2685eab8d8b7409b3640714035dfe5be200846237a951ad5e8c202086ff3787a7034af7fce313960035e96faf
 MISC metadata.xml 238 SHA256 faed616f6fe559ac77f14493df99e7a36065ef400c7ada8bbaca11bbf6b146e7 SHA512 13acc82b4618054e248b2bf25a242ad2a7793d740cd342291bcbfbee2847717899193eb841bb462389f9b94a5b78cd7dcd9212168266e41e91ddad313dfd1ab1 WHIRLPOOL 63b34154d1d1017cc04c5c671c719f8acf5b6f8a32040487fa2091402f5322ec1b9f68f11d5f178f7768792d387ec740934b3a8c0f4771a2f0124588c5fd0cc9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR7fY7AAoJEJ0WA1zPCt1hyE0IAKvKTTxMERpLwevZ6pjKOycy
+HiHHRPySNc38P16mq++UON8M5QdXjJLOsPTR61WlIufVeowjERTk53zPorO49yjQ
+8vX0h8T5FsQxNw5nWs6AtbAKRpGwfvYg5scxuZ9XKAGllMlay+2YZ9ceLoRknazv
+8XNwJP+g8fkFpJxCMJJ7/Mh2/5/Qz9NjvBJPA4FALBtgKi9QlfrCceFIGQCn2GEl
+SiecldZxKJPVMD6opjbK03RTRkDUncrk3Mp3Jbswu+MgiNQZXH2Rcv9vWqSKTVuI
+AJ70DumO/5X+PeinaDlIGHpLoism8P4l6HmrHSk3GChjUlr7RA2lnVTE52IbkvI=
+=ap4Q
+-----END PGP SIGNATURE-----
diff --git a/app-text/unac/files/unac-1.8.0-automake-1.13.1.patch b/app-text/unac/files/unac-1.8.0-automake-1.13.1.patch
new file mode 100644
index 000000000000..eaad52a53f14
--- /dev/null
+++ b/app-text/unac/files/unac-1.8.0-automake-1.13.1.patch
@@ -0,0 +1,40 @@
+From 43e4c8788491c378862654933cc6d59d46f571c6 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 22 Jul 2013 23:07:04 -0400
+Subject: [PATCH] build: modernize for automake-1.14
+
+https://bugs.gentoo.org/show_bug.cgi?id=467618
+---
+ Makefile.am  | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b4c658c..b40192e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,7 @@
+ # Documentation
+ #
+ man_MANS = unaccent.1 unac.3
+-INCLUDES = -DUNAC_VERSION=\"$(VERSION)\"
++AM_CPPFLAGS = -DUNAC_VERSION=\"$(VERSION)\"
+ 
+ #
+ # Support programs
+diff --git a/configure.ac b/configure.ac
+index 4a4eab6..444a9d5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,7 +26,7 @@ AC_SUBST(MICRO_VERSION)
+ AM_INIT_AUTOMAKE([unac], $VERSION, nosubst)
+ AC_PREREQ(2.50)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ AC_PROG_MAKE_SET
+ 
+-- 
+1.8.3.2
+
diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild
index 15c0604858cc..1c48f53e16c2 100644
--- a/app-text/unac/unac-1.8.0.ebuild
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unac/unac-1.8.0.ebuild,v 1.3 2012/05/25 11:35:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/unac/unac-1.8.0.ebuild,v 1.4 2013/07/23 03:19:22 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit autotools eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="Library and command-line tool for removing accents from characters"
 HOMEPAGE="http://www.nongnu.org/unac/"
 SRC_URI="mirror://debian/pool/main/u/unac/${P/-/_}.orig.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="static-libs test"
@@ -21,10 +21,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}.orig"
 
-DOCS="AUTHORS ChangeLog NEWS README THANKS"
-
 src_prepare() {
 	epatch "${FILESDIR}/${P}-debian-gcc-4.4-bug-556379.patch"
+	epatch "${FILESDIR}/${P}-automake-1.13.1.patch"
 	# otherwise automake will fail
 	touch config.rpath
 	eautoreconf
@@ -35,8 +34,9 @@ src_configure() {
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README THANKS"
 	default
-	find "${D}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files
 }
 
 pkg_postinst() {