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

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 16 insertions, 122 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/Manifest b/app-text/evince/Manifest
index 459c7b904da3..83af8478f066 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -12,17 +12,14 @@ AUX evince-2.32.0-update-poppler.patch 1890 RMD160 8032f418acd4411e0a547a085d06b
 AUX evince-2.32.0-use-popup.patch 766 RMD160 9260e11fae9fa98cc739602a308793199bc75ce7 SHA1 7711c4b6a0d64b31ca0935da4c94a633d6ae1cab SHA256 c53276beb4f975a9ed47fe35dd2756458d9e5e334234aeac2ff4d47ad790d9ea
 AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8
 DIST evince-2.32.0.tar.bz2 2295272 RMD160 a2d52685ac119b70cf40f320de457b3dfbac2587 SHA1 2f06a2b9dfd8667f4b4c6e90be3c49f6fe026fc8 SHA256 2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7
-EBUILD evince-2.32.0-r1.ebuild 3342 RMD160 209c299c91f6dd0a1be447d0a72d1646e1828c0f SHA1 c9138af6cdb365843a055ef183a62b0b1a8ddde1 SHA256 49773c595ea422056fc6d80cf1d9c935c18a3ed3821523b66ab698229379f265
 EBUILD evince-2.32.0-r2.ebuild 3834 RMD160 929684ca7149e1c47220d8fd46b4a4b3f4314a94 SHA1 67b0efc15d2f38b16d295f2b9c00d54a0423ecfb SHA256 2ec1e71428c961ce2c8caf456764380e7dfb24f9d8043cb4630f99aec1826337
-EBUILD evince-2.32.0-r3.ebuild 3945 RMD160 b3c24d6add24a1d04685e1f12d4b74f2000caf9f SHA1 bcb41249f954f7d80f77e8a75ea459a31a87fe9e SHA256 b563e56bab783a42125447196b905a18ac8aa7c6253578ff864f6f926be65ef6
-MISC ChangeLog 32394 RMD160 80b1b189eb9b19135f78af8d42d189ddf407c82e SHA1 747a7e7e5e0d8137fb7876d5349109c25b5c6a87 SHA256 b039dab4c99f7a83de1bce8f9a2c534c4eef8c403f974ee3620f16ff86383b1b
+EBUILD evince-2.32.0-r3.ebuild 4092 RMD160 90994edfe8f9bd4471a9247cd99dc4cfdfe6e05f SHA1 858c74812b09efb5435c3c95bfbbfc5e3bcdad89 SHA256 f237da8d491a3c6f2f219da33c59a05915933c8cf1b97e5309077524860ec638
+MISC ChangeLog 32566 RMD160 1d55edf76495f95e1d2828597d0a6281942f0479 SHA1 761c9eb54618fa39a8388a24b13fa0776672766a SHA256 810ab0bcd0404e6b2365e9899b9056d7ba379491485d0404da35361a46ebea5d
 MISC metadata.xml 704 RMD160 86b7f170da9780a261a10f31ca336bc727511962 SHA1 76786146716c3d6ff74232b11f79a9258b82fa8b SHA256 c331692598dc31958f7913fd9948522a3b9c0335f0354bb58d990eeaf8052047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk22qgMACgkQIiMqcbOVdxS69wP9E2thK4fjJFAwGvS+I6k8bcdR
-4cL5o/5/MnoZO3W54LW4JM2T2dvlXz3oxvrVdGZsTTg+7c2xdudRlH1PdWu/DOeq
-RBTryuUWlBHoUJ9tZeFpheLB8etf3kfLmHS/bu294h926fEjaX0L5mStVKTUrTHa
-A3SUoIA/ze7+Fxt0+hY=
-=2Dhg
+iEYEARECAAYFAk31CHAACgkQCaWpQKGI+9S1rwCfc5I19Vy1BSoHOPjJXGiGoYrf
+zJAAnivi2xFZXM2x9EOo2vE19WlUO86r
+=AfPJ
 -----END PGP SIGNATURE-----
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
 }