Fix gconf-2.m4 missing again (bug #371272 by Francesco Turco). Remove old.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

3 files changed, 11 insertions, 114 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index a1d476e4dcb6..8a1a9f3f7057 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -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
diff --git a/app-text/evince/evince-2.32.0-r1.ebuild b/app-text/evince/evince-2.32.0-r1.ebuild
deleted file mode 100644
index d2c76a464749..000000000000
--- a/app-text/evince/evince-2.32.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-r1.ebuild,v 1.7 2011/03/22 20:06:01 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://projects.gnome.org/evince/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-
-IUSE="dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus t1lib tiff"
-
-# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
-# not mature enough
-RDEPEND="
-	>=app-text/libspectre-0.2.0
-	>=dev-libs/glib-2.25.11:2
-	>=dev-libs/libxml2-2.5:2
-	>=x11-libs/gtk+-2.21.5:2[introspection?]
-	>=x11-libs/libSM-1
-	|| (
-		>=x11-themes/gnome-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-	>=x11-libs/cairo-1.9.10
-	>=app-text/poppler-0.14[cairo]
-	djvu? ( >=app-text/djvu-3.5.17 )
-	dvi? (
-		virtual/tex-base
-		t1lib? ( >=media-libs/t1lib-5.0.0 ) )
-	gnome? ( >=gnome-base/gconf-2:2[introspection?] )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6 )
-	nautilus? ( >=gnome-base/nautilus-2.10[introspection?] )
-	tiff? ( >=media-libs/tiff-3.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	>=dev-util/pkgconfig-0.9
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.13
-	doc? ( >=dev-util/gtk-doc-1.13 )"
-
-ELTCONF="--portage"
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
-
-pkg_setup() {
-	# Passing --disable-help would drop offline help, that would be inconsistent
-	# with helps of the most of Gnome apps that doesn't require network for that.
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-static
-		--disable-tests
-		--enable-pdf
-		--enable-comics
-		--enable-impress
-		--enable-thumbnailer
-		--with-smclient=xsmp
-		--with-platform=gnome
-		--with-gtk=2.0
-		--enable-help
-		--disable-maintainer-mode
-		$(use_enable dbus)
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome gconf)
-		$(use_with gnome-keyring keyring)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable t1lib)
-		$(use_enable tiff)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Check for NULL in synctex_backward_search preventing segfault, upstream bug #630845
-	epatch "${FILESDIR}"/${P}-libdocument-segfault.patch
-
-	# Fix multiple security issues with dvi backend, bug #350681
-	epatch "${FILESDIR}"/${P}-dvi-CVEs.patch
-
-	# Fix problem with some pk fonts, upstream bug #639746
-	epatch "${FILESDIR}"/${PN}-2.32.0-pk-fonts.patch
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "intltoolize sed failed"
-
-	# Do not depend on gnome-icon-theme, bug #326855
-	sed 's/gnome-icon-theme//' -i configure.ac configure || die "sed failed"
-
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of lafiles failed"
-}
diff --git a/app-text/evince/evince-2.32.0-r3.ebuild b/app-text/evince/evince-2.32.0-r3.ebuild
index 9c6b7dfed1dd..8a4a34509e55 100644
--- a/app-text/evince/evince-2.32.0-r3.ebuild
+++ b/app-text/evince/evince-2.32.0-r3.ebuild
@@ -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 @@ src_prepare() {
 	# 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
 }