From 647222c5f69f458e66bb4c93ec21f93d0113d65f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 23 Apr 2012 20:14:52 +0000 Subject: Stub out AM_ICONV if gettext is not installed. (Portage version: 2.2.0_alpha100/cvs/Linux x86_64) --- media-libs/gd/ChangeLog | 5 ++++- media-libs/gd/gd-2.0.35-r3.ebuild | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog index 692e236b1e4f..6e368b9b2f2f 100644 --- a/media-libs/gd/ChangeLog +++ b/media-libs/gd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/gd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.82 2012/03/05 06:54:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.83 2012/04/23 20:14:52 vapier Exp $ + + 23 Apr 2012; Mike Frysinger gd-2.0.35-r3.ebuild: + Stub out AM_ICONV if gettext is not installed. 05 Mar 2012; Mike Frysinger gd-2.0.35-r3.ebuild: Restore sed -r flag after refactor in previous commit lost it #406933 by diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild index 849ef6b5d308..1391e0875415 100644 --- a/media-libs/gd/gd-2.0.35-r3.ebuild +++ b/media-libs/gd/gd-2.0.35-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.15 2012/03/05 06:54:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r3.ebuild,v 1.16 2012/04/23 20:14:52 vapier Exp $ EAPI="2" @@ -36,6 +36,10 @@ src_prepare() { use zlib || make_sed+=( -e '/_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng|pngtogd2)::g' ) sed -i -r "${make_sed[@]}" Makefile.am || die + cat <<-EOF > acinclude.m4 + m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[:])]) + EOF + eautoreconf } -- cgit v1.2.3-65-gdbad