vapier 14/06/15 00:59:17 Modified: ChangeLog gd-2.0.35-r4.ebuild Log: Make sure @LIBICONV@ is replaced when nls is unavailable #512942 by Ulrich Müller.
Revision Changes Path 1.90 media-libs/gd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.90&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.90&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?r1=1.89&r2=1.90 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- ChangeLog 21 May 2014 18:39:27 -0000 1.89 +++ ChangeLog 15 Jun 2014 00:59:17 -0000 1.90 @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.89 2014/05/21 18:39:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.90 2014/06/15 00:59:17 vapier Exp $ + + 15 Jun 2014; Mike Frysinger <[email protected]> gd-2.0.35-r4.ebuild: + Make sure @LIBICONV@ is replaced when nls is unavailable #512942 by Ulrich + Müller. *gd-2.0.35-r4 (21 May 2014) 1.2 media-libs/gd/gd-2.0.35-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?r1=1.1&r2=1.2 Index: gd-2.0.35-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gd-2.0.35-r4.ebuild 21 May 2014 18:39:27 -0000 1.1 +++ gd-2.0.35-r4.ebuild 15 Jun 2014 00:59:17 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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-r4.ebuild,v 1.1 2014/05/21 18:39:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v 1.2 2014/06/15 00:59:17 vapier Exp $ EAPI="5" @@ -44,7 +44,7 @@ sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac || die cat <<-EOF > acinclude.m4 - m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[:])]) + m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[AC_SUBST(LIBICONV)])]) EOF eautoreconf
