only 0.4.0 needs automake, so it gets a gnome-common dep. Remove autoreconf from the rest. Bug #150115

(Portage version: 2.1.2_pre2-r3)

8 files changed, 18 insertions, 44 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 7d02b857207e..30689e1134b7 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.58 2006/09/19 19:03:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.59 2006/10/06 14:26:27 dang Exp $
+
+  06 Oct 2006; Daniel Gryniewicz <dang@gentoo.org> evince-0.4.0-r3.ebuild,
+  evince-0.5.0.ebuild, evince-0.5.1.ebuild, evince-0.5.3-r1.ebuild,
+  evince-0.5.4.ebuild, evince-0.5.5.ebuild, evince-0.6.0.ebuild:
+  only 0.4.0 needs automake, so it gets a gnome-common dep. Remove autoreconf
+  from the rest. Bug #150115
 
   19 Sep 2006; Aron Griffis <agriffis@gentoo.org> evince-0.5.3-r1.ebuild:
   Mark 0.5.3-r1 stable on ia64. #139612
diff --git a/app-text/evince/evince-0.4.0-r3.ebuild b/app-text/evince/evince-0.4.0-r3.ebuild
index 1f430dc49a6d..cd07c4198329 100644
--- a/app-text/evince/evince-0.4.0-r3.ebuild
+++ b/app-text/evince/evince-0.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.4.0-r3.ebuild,v 1.9 2006/04/22 22:10:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.4.0-r3.ebuild,v 1.10 2006/10/06 14:26:27 dang Exp $
 
 inherit eutils gnome2
 
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/pkgconfig-0.9
+	>=gnome-base/gnome-common-2
 	>=dev-util/intltool-0.28"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/app-text/evince/evince-0.5.0.ebuild b/app-text/evince/evince-0.5.0.ebuild
index c19ae89446a4..e013115e85ba 100644
--- a/app-text/evince/evince-0.5.0.ebuild
+++ b/app-text/evince/evince-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.0.ebuild,v 1.6 2006/04/22 22:10:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.0.ebuild,v 1.7 2006/10/06 14:26:27 dang Exp $
 
 inherit eutils gnome2
 
@@ -69,9 +69,4 @@ src_unpack(){
 
 	# Fix .desktop file so menu item shows up
 	epatch ${FILESDIR}/${PN}-0.4.0-display-menu.patch
-
-	export WANT_AUTOMAKE=1.7
-	automake || die "automake failed"
-	autoconf || die "autoconf failed"
-	libtoolize --copy --force || die "libtoolize failed"
 }
diff --git a/app-text/evince/evince-0.5.1.ebuild b/app-text/evince/evince-0.5.1.ebuild
index 8fcd9f0067cf..01cb519111c0 100644
--- a/app-text/evince/evince-0.5.1.ebuild
+++ b/app-text/evince/evince-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.1.ebuild,v 1.8 2006/06/08 12:45:42 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.1.ebuild,v 1.9 2006/10/06 14:26:27 dang Exp $
 
 inherit eutils gnome2
 
@@ -69,9 +69,4 @@ src_unpack(){
 
 	# Fix .desktop file so menu item shows up
 	epatch ${FILESDIR}/${PN}-0.4.0-display-menu.patch
-
-	export WANT_AUTOMAKE=1.7
-	automake || die "automake failed"
-	autoconf || die "autoconf failed"
-	libtoolize --copy --force || die "libtoolize failed"
 }
diff --git a/app-text/evince/evince-0.5.3-r1.ebuild b/app-text/evince/evince-0.5.3-r1.ebuild
index 5d384a680eb4..8485194137e4 100644
--- a/app-text/evince/evince-0.5.3-r1.ebuild
+++ b/app-text/evince/evince-0.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.3-r1.ebuild,v 1.8 2006/09/19 19:03:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.3-r1.ebuild,v 1.9 2006/10/06 14:26:27 dang Exp $
 
 inherit eutils gnome2
 
@@ -73,9 +73,4 @@ src_unpack(){
 
 	# Fix documents with links
 	epatch ${FILESDIR}/${P}-links.patch
-
-	export WANT_AUTOMAKE=1.9
-	automake || die "automake failed"
-	autoconf || die "autoconf failed"
-	libtoolize --copy --force || die "libtoolize failed"
 }
diff --git a/app-text/evince/evince-0.5.4.ebuild b/app-text/evince/evince-0.5.4.ebuild
index 054acca095e6..e451773a2397 100644
--- a/app-text/evince/evince-0.5.4.ebuild
+++ b/app-text/evince/evince-0.5.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.4.ebuild,v 1.2 2006/07/27 16:33:02 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.4.ebuild,v 1.3 2006/10/06 14:26:27 dang Exp $
 
-inherit eutils gnome2 autotools
+inherit eutils gnome2
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
@@ -71,10 +71,4 @@ src_unpack(){
 
 	# Fix .desktop file so menu item shows up
 	epatch ${FILESDIR}/${PN}-0.5.3-display-menu.patch
-
-	eautoreconf
-	#export WANT_AUTOMAKE=1.9
-	#automake || die "automake failed"
-	#autoconf || die "autoconf failed"
-	#libtoolize --copy --force || die "libtoolize failed"
 }
diff --git a/app-text/evince/evince-0.5.5.ebuild b/app-text/evince/evince-0.5.5.ebuild
index 93b35e552215..1fe3a12b0340 100644
--- a/app-text/evince/evince-0.5.5.ebuild
+++ b/app-text/evince/evince-0.5.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.5.ebuild,v 1.1 2006/08/08 03:39:13 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.5.ebuild,v 1.2 2006/10/06 14:26:27 dang Exp $
 
-inherit eutils gnome2 autotools
+inherit eutils gnome2
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
@@ -71,10 +71,4 @@ src_unpack(){
 
 	# Fix .desktop file so menu item shows up
 	epatch ${FILESDIR}/${PN}-0.5.3-display-menu.patch
-
-	eautoreconf
-	#export WANT_AUTOMAKE=1.9
-	#automake || die "automake failed"
-	#autoconf || die "autoconf failed"
-	#libtoolize --copy --force || die "libtoolize failed"
 }
diff --git a/app-text/evince/evince-0.6.0.ebuild b/app-text/evince/evince-0.6.0.ebuild
index 21c6010bc888..0e72c2fb7851 100644
--- a/app-text/evince/evince-0.6.0.ebuild
+++ b/app-text/evince/evince-0.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.0.ebuild,v 1.1 2006/09/05 03:48:56 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.6.0.ebuild,v 1.2 2006/10/06 14:26:27 dang Exp $
 
-inherit eutils gnome2 autotools
+inherit eutils gnome2
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
@@ -74,10 +74,4 @@ src_unpack(){
 
 	# Fix .desktop file so menu item shows up
 	epatch ${FILESDIR}/${PN}-0.5.3-display-menu.patch
-
-	eautoreconf
-	#export WANT_AUTOMAKE=1.9
-	#automake || die "automake failed"
-	#autoconf || die "autoconf failed"
-	#libtoolize --copy --force || die "libtoolize failed"
 }