[gentoo-commits] gentoo-x86 commit in sys-apps/pacman: ChangeLog pacman-4.0.1.ebuild

[gentoo-commits] gentoo-x86 commit in sys-apps/pacman: ChangeLog pacman-4.0.1.ebuild

[Nathan Phillip Brink (binki)]

binki       12/06/16 05:28:26

  Modified:             ChangeLog pacman-4.0.1.ebuild
  Log:
  Fix inconsistency between m4/gettext.m4 and Makefile.in.in caused by autopoint running. Fixes bug #420469 by Ilya Gordeev.
  
  (Portage version: 2.2.0_alpha110-r1/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 sys-apps/pacman/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pacman/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pacman/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pacman/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/pacman/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	8 May 2012 18:47:47 -0000	1.10
+++ ChangeLog	16 Jun 2012 05:28:26 -0000	1.11
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pacman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/ChangeLog,v 1.10 2012/05/08 18:47:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/ChangeLog,v 1.11 2012/06/16 05:28:26 binki Exp $
+
+  16 Jun 2012; Nathan Phillip Brink <binki@gentoo.org> pacman-4.0.1.ebuild:
+  Fix inconsistency between m4/gettext.m4 and Makefile.in.in caused by
+  autopoint running. Fixes bug #420469 by Ilya Gordeev.
 
   08 May 2012; Jeff Horelick <jdhore@gentoo.org> pacman-4.0.1.ebuild:
   Keyword ~x86. Tested by me, signed off by binki.



1.3                  sys-apps/pacman/pacman-4.0.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pacman/pacman-4.0.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pacman/pacman-4.0.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pacman/pacman-4.0.1.ebuild?r1=1.2&r2=1.3

Index: pacman-4.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/pacman/pacman-4.0.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pacman-4.0.1.ebuild	8 May 2012 18:47:47 -0000	1.2
+++ pacman-4.0.1.ebuild	16 Jun 2012 05:28:26 -0000	1.3
@@ -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/sys-apps/pacman/pacman-4.0.1.ebuild,v 1.2 2012/05/08 18:47:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pacman/pacman-4.0.1.ebuild,v 1.3 2012/06/16 05:28:26 binki Exp $
 
 EAPI=4
 
@@ -41,6 +41,15 @@
 	# Remove a line that adds -Werror in ./configure when --enable-debug
 	# is passed:
 	sed -i -e '/-Werror/d' configure.ac || die "-Werror"
+
+	# autopoint is unwilling to replace m4/gettext.m4 with the correct
+	# version even though it'll gladly replace */po/Makefile.in.in,
+	# creating an inconsistency between gettext m4 macros and
+	# Makefile.in.in. Also, AM_MKINSTALLDIRS apparently doesn't exist
+	# anymore, so we need newer gettext macros. #420469
+	rm m4/gettext.m4 || die
+	sed -i -e '/AM_GNU_GETTEXT_VERSION/s/0\.13\.1/0.18.1/' configure.ac || die
+
 	eautoreconf
 }