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

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

3 files changed, 54 insertions, 9 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/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() {