summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-04-25 18:43:59 +0000
committerTim Harder <radhermit@gentoo.org>2013-04-25 18:43:59 +0000
commita9b4de9ffc14f95b9f51c293a0ee7540b928eb57 (patch)
tree2963163074283f92881fb38d3d10699de7cca0d2 /net-print/gutenprint
parentUpdate Gnome 3.8 mask (diff)
downloadgentoo-2-a9b4de9ffc14f95b9f51c293a0ee7540b928eb57.tar.gz
gentoo-2-a9b4de9ffc14f95b9f51c293a0ee7540b928eb57.tar.bz2
gentoo-2-a9b4de9ffc14f95b9f51c293a0ee7540b928eb57.zip
Fix autoreconf failures with automake-1.13 (bug #467206).
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'net-print/gutenprint')
-rw-r--r--net-print/gutenprint/ChangeLog7
-rw-r--r--net-print/gutenprint/gutenprint-5.2.9.ebuild10
2 files changed, 12 insertions, 5 deletions
diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index c64b7031bf75..948a6ddf1907 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-print/gutenprint
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.48 2012/12/30 15:03:55 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.49 2013/04/25 18:43:59 radhermit Exp $
+
+ 25 Apr 2013; Tim Harder <radhermit@gentoo.org> gutenprint-5.2.9.ebuild:
+ Fix autoreconf failures with automake-1.13 (bug #467206).
30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> gutenprint-5.2.9.ebuild:
Stable for alpha, wrt bug #442448
diff --git a/net-print/gutenprint/gutenprint-5.2.9.ebuild b/net-print/gutenprint/gutenprint-5.2.9.ebuild
index 03f8eeaf15c9..6118a11321ed 100644
--- a/net-print/gutenprint/gutenprint-5.2.9.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.9.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/net-print/gutenprint/gutenprint-5.2.9.ebuild,v 1.9 2012/12/30 15:03:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.9.ebuild,v 1.10 2013/04/25 18:43:59 radhermit Exp $
EAPI=4
@@ -36,7 +36,11 @@ DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
src_prepare() {
epatch "${FILESDIR}"/${PN}-5.2.4-CFLAGS.patch
epatch "${FILESDIR}"/${PN}-5.2.8-genppd.patch # bug 382927
- sed -i -e "s:m4local:m4extra:" Makefile.am || die
+ sed -i "s:m4local:m4extra:" Makefile.am || die
+
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+ -e "s/AM_PROG_CC_STDC/AC_PROG_CC/" \
+ -i configure.ac || die
eautoreconf
}