summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-05-03 18:14:51 +0000
committerFabian Groffen <grobian@gentoo.org>2013-05-03 18:14:51 +0000
commit3a67c2379ff5ba10b0f0dca452d54ed50c579827 (patch)
treead85442ec3c510f17e86b0e1d3c8f163baeffe53 /app-admin/chrpath
parentRevert unnecessary revision bump and autotools-utils.eclass port. (diff)
downloadgentoo-2-3a67c2379ff5ba10b0f0dca452d54ed50c579827.tar.gz
gentoo-2-3a67c2379ff5ba10b0f0dca452d54ed50c579827.tar.bz2
gentoo-2-3a67c2379ff5ba10b0f0dca452d54ed50c579827.zip
Fix building with automake-1.13, bug #467538
(Portage version: 2.2.01.21890-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'app-admin/chrpath')
-rw-r--r--app-admin/chrpath/ChangeLog7
-rw-r--r--app-admin/chrpath/chrpath-0.13-r2.ebuild6
2 files changed, 9 insertions, 4 deletions
diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog
index f9d5ffa8012d..3e370588b809 100644
--- a/app-admin/chrpath/ChangeLog
+++ b/app-admin/chrpath/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/chrpath
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.25 2012/11/12 19:19:21 grobian Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.26 2013/05/03 18:14:51 grobian Exp $
+
+ 03 May 2013; Fabian Groffen <grobian@gentoo.org> chrpath-0.13-r2.ebuild:
+ Fix building with automake-1.13, bug #467538
12 Nov 2012; Fabian Groffen <grobian@gentoo.org> chrpath-0.13-r2.ebuild,
files/chrpath-0.13-multilib.patch:
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index 57ea5a84aaab..16dc9a62a633 100644
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -1,6 +1,6 @@
-# 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-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.11 2012/11/12 19:19:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.12 2013/05/03 18:14:51 grobian Exp $
EAPI="2"
@@ -22,6 +22,8 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-testsuite-1.patch
# disable installing redundant docs in the wrong dir
sed -i -e '/doc_DATA/d' Makefile.am || die
+ # fix for automake-1.13, #467538
+ sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
eautoreconf
}