[gentoo-commits] gentoo-x86 commit in app-text/evince: ChangeLog evince-2.32.0-r3.ebuild evince-2.32.0-r1.ebuild

[gentoo-commits] gentoo-x86 commit in app-text/evince: ChangeLog evince-2.32.0-r3.ebuild evince-2.32.0-r1.ebuild

[Pacho Ramos (pacho)]

pacho       11/06/12 18:41:46

  Modified:             ChangeLog evince-2.32.0-r3.ebuild
  Removed:              evince-2.32.0-r1.ebuild
  Log:
  Fix gconf-2.m4 missing again (bug #371272 by Francesco Turco). Remove old.
  
  (Portage version: 2.1.9.50/cvs/Linux x86_64)

Revision  Changes    Path
1.222                app-text/evince/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?rev=1.222&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?rev=1.222&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/ChangeLog?r1=1.221&r2=1.222

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- ChangeLog	26 Apr 2011 11:18:18 -0000	1.221
+++ ChangeLog	12 Jun 2011 18:41:46 -0000	1.222
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.221 2011/04/26 11:18:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.222 2011/06/12 18:41:46 pacho Exp $
+
+  12 Jun 2011; Pacho Ramos <pacho@gentoo.org> -evince-2.32.0-r1.ebuild,
+  evince-2.32.0-r3.ebuild:
+  Fix gconf-2.m4 missing again (bug #371272 by Francesco Turco). Remove old.
 
   26 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> evince-2.32.0-r2.ebuild:
   ppc64 stable wrt #363447



1.2                  app-text/evince/evince-2.32.0-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild?r1=1.1&r2=1.2

Index: evince-2.32.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evince-2.32.0-r3.ebuild	21 Apr 2011 12:11:58 -0000	1.1
+++ evince-2.32.0-r3.ebuild	12 Jun 2011 18:41:46 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild,v 1.1 2011/04/21 12:11:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild,v 1.2 2011/06/12 18:41:46 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -120,6 +120,11 @@
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
 
+	# gconf-2.m4 is needed for autoconf, bug #291339
+	if ! use gnome; then
+		cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!"
+	fi
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }