radhermit 14/06/21 06:56:00 Modified: ChangeLog photoprint-0.4.2_pre2.ebuild Log: Fix gettext version mismatches (bug #514082). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Revision Changes Path 1.5 media-gfx/photoprint/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/ChangeLog?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/ChangeLog?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/ChangeLog?r1=1.4&r2=1.5 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/photoprint/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ChangeLog 11 Jun 2012 17:23:09 -0000 1.4 +++ ChangeLog 21 Jun 2014 06:56:00 -0000 1.5 @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/photoprint -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/ChangeLog,v 1.4 2012/06/11 17:23:09 radhermit Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/ChangeLog,v 1.5 2014/06/21 06:56:00 radhermit Exp $ + + 21 Jun 2014; Tim Harder <radher...@gentoo.org> photoprint-0.4.2_pre2.ebuild: + Fix gettext version mismatches (bug #514082). 11 Jun 2012; Tim Harder <radher...@gentoo.org> photoprint-0.4.2_pre2.ebuild, +files/photoprint-0.4.2_pre2-glib-2.32.patch: 1.5 media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild?r1=1.4&r2=1.5 Index: photoprint-0.4.2_pre2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- photoprint-0.4.2_pre2.ebuild 11 Jun 2012 17:23:09 -0000 1.4 +++ photoprint-0.4.2_pre2.ebuild 21 Jun 2014 06:56:00 -0000 1.5 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild,v 1.4 2012/06/11 17:23:09 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild,v 1.5 2014/06/21 06:56:00 radhermit Exp $ EAPI=4 @@ -38,9 +38,11 @@ "${FILESDIR}"/${P}-underlinking.patch \ "${FILESDIR}"/${P}-glib-2.32.patch - # Ships with po/Makefile.in.in from gettext-0.17 - # which fails with >=gettext-0.18 - sed -i -e "/AM_GNU_GETTEXT_VERSION/s/17/18/" configure.ac || die + # don't specify a gettext version + sed -i "/^AM_GNU_GETTEXT_VERSION/d" configure.ac || die + + # avoid gettext version mismatches (bug #514082) + sed -i "/^GETTEXT_MACRO_VERSION/s/=.*/= @GETTEXT_MACRO_VERSION@/" po/Makefile.in.in || die eautoreconf }
