Remove old. Remove unnecessary autotools inherit on latest

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

5 files changed, 9 insertions, 156 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index d55d395b2e5e..76df6f5a4002 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.149 2008/08/12 13:52:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.150 2008/08/12 22:34:20 leio Exp $
+
+  12 Aug 2008; Mart Raudsepp <leio@gentoo.org> evince-2.20.1.ebuild,
+  -evince-2.22.0.ebuild, -evince-2.22.1.1.ebuild, evince-2.22.2-r1.ebuild:
+  Remove old. Remove unnecessary autotools inherit on latest
 
   12 Aug 2008; Raúl Porcel <armin76@gentoo.org> evince-2.22.2-r1.ebuild:
   alpha/ia64/sparc stable wrt #229709
diff --git a/app-text/evince/evince-2.20.1.ebuild b/app-text/evince/evince-2.20.1.ebuild
index 50f3cc443d7a..a981a8dc9e2c 100644
--- a/app-text/evince/evince-2.20.1.ebuild
+++ b/app-text/evince/evince-2.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.20.1.ebuild,v 1.11 2008/07/06 15:36:43 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.20.1.ebuild,v 1.12 2008/08/12 22:34:20 leio Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils gnome2 autotools
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/evince/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE="dbus djvu doc dvi gnome t1lib tiff"
 
 RDEPEND="
diff --git a/app-text/evince/evince-2.22.0.ebuild b/app-text/evince/evince-2.22.0.ebuild
deleted file mode 100644
index 7d5fc07ce490..000000000000
--- a/app-text/evince/evince-2.22.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.0.ebuild,v 1.4 2008/07/01 21:33:05 eva Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dbus djvu doc dvi gnome gnome-keyring t1lib tiff"
-
-RDEPEND="
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2.15.6
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/libgnome-2.14
-	>=x11-themes/gnome-icon-theme-2.17.1
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	>=app-text/poppler-bindings-0.6
-	dvi? (
-		virtual/tetex
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
-	tiff? ( >=media-libs/tiff-3.6 )
-	djvu? ( >=app-text/djvu-3.5.17 )
-	>=app-text/libspectre-0.2.0"
-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/automake-1.9
-	>=dev-util/intltool-0.35
-	dev-util/gtk-doc-am
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-ELTCONF="--portage"
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--enable-comics
-		--enable-impress
-		$(use_enable dbus)
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome-keyring keyring)
-		$(use_enable t1lib)
-		$(use_enable tiff)
-		$(use_enable gnome nautilus)"
-
-	if ! built_with_use app-text/poppler-bindings gtk; then
-		einfo "Please re-emerge app-text/poppler-bindings with the gtk USE flag set"
-		die "poppler-bindings needs gtk flag set"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
-
-	# Make dbus actually switchable
-	epatch "${FILESDIR}"/${PN}-0.6.1-dbus-switch.patch
-
-	eautoreconf
-}
diff --git a/app-text/evince/evince-2.22.1.1.ebuild b/app-text/evince/evince-2.22.1.1.ebuild
deleted file mode 100644
index 36cdebbd5058..000000000000
--- a/app-text/evince/evince-2.22.1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.1.1.ebuild,v 1.4 2008/07/01 21:33:05 eva Exp $
-
-inherit eutils gnome2 autotools
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dbus djvu doc dvi gnome gnome-keyring t1lib tiff"
-
-RDEPEND="
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2.15.6
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/libgnome-2.14
-	>=x11-themes/gnome-icon-theme-2.17.1
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	>=app-text/poppler-bindings-0.6
-	dvi? (
-		virtual/tex-base
-		t1lib? ( >=media-libs/t1lib-5.0.0 )
-	)
-	tiff? ( >=media-libs/tiff-3.6 )
-	djvu? ( >=app-text/djvu-3.5.17 )
-	>=app-text/libspectre-0.2.0"
-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/automake-1.9
-	>=dev-util/intltool-0.35
-	dev-util/gtk-doc-am
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-ELTCONF="--portage"
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--enable-comics
-		--enable-impress
-		$(use_enable dbus)
-		$(use_enable djvu)
-		$(use_enable dvi)
-		$(use_with gnome-keyring keyring)
-		$(use_enable t1lib)
-		$(use_enable tiff)
-		$(use_enable gnome nautilus)"
-
-	if ! built_with_use app-text/poppler-bindings gtk; then
-		einfo "Please re-emerge app-text/poppler-bindings with the gtk USE flag set"
-		die "poppler-bindings needs gtk flag set"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix .desktop file so menu item shows up
-	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
-}
diff --git a/app-text/evince/evince-2.22.2-r1.ebuild b/app-text/evince/evince-2.22.2-r1.ebuild
index 69a1bd1363a9..4ca03b35a193 100644
--- a/app-text/evince/evince-2.22.2-r1.ebuild
+++ b/app-text/evince/evince-2.22.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.2-r1.ebuild,v 1.5 2008/08/12 13:52:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.22.2-r1.ebuild,v 1.6 2008/08/12 22:34:20 leio Exp $
 
-inherit eutils gnome2 autotools
+inherit eutils gnome2
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"