New version of evince. Adds comicbook support, among other thigns

Package-Manager: portage-2.1_pre3-r1

7 files changed, 28 insertions, 96 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index a2b46e4e6cd2..626cb110a090 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.21 2006/01/19 15:34:33 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.22 2006/01/20 17:28:15 dang Exp $
+
+*evince-0.5.0 (20 Jan 2006)
+
+  20 Jan 2006; <dang@gentoo.org> -evince-0.4.0-r1.ebuild,
+  -evince-0.4.0-r2.ebuild, +evince-0.5.0.ebuild:
+  New version of evince.  Adds comicbook support, among other thigns
 
   19 Jan 2006; <dang@gentoo.org> evince-0.4.0-r3.ebuild:
   Evince deps on ghostscript to process postscript files. Bug #119103
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 829c81a1e2e9..c3a1441525fc 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,13 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0a8304152c709b3f3059f5e4eec42db1 ChangeLog 3490
-MD5 e4d15a65822c1ff8fd89a3a2568a371f evince-0.4.0-r1.ebuild 1657
-MD5 82ab218cb2e468deee629119301f6697 evince-0.4.0-r2.ebuild 1983
+MD5 d671f8fbcf00148414266f5481434e3f ChangeLog 3696
 MD5 5bc84e920525ab1012ef60ce98052e37 evince-0.4.0-r3.ebuild 2028
-MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0-r1 65
-MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0-r2 65
+MD5 e53e0ced069fd3cb629739af3f447c82 evince-0.5.0.ebuild 1882
 MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0-r3 65
+MD5 7f50c30053f0d6366013fcafccbd34ee files/digest-evince-0.5.0 66
 MD5 185784a35b672ed49ea8afb3aba25e30 files/evince-0.4.0-display-menu.patch 471
 MD5 94070710202e7c8024edc662eb420658 files/evince-0.4.0-no-tiff.patch 985
 MD5 755b327b4928ab9492b7c2aab72ef52d files/evince-0.4.0-t1lib_is_t1.patch 976
@@ -15,7 +13,7 @@ MD5 6725733a03ee56bb113dedaca6063b0f metadata.xml 218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDz7HHomPajV0RnrERAp7HAJ9YrYRdHN90gnAoZKtvg8QmVP8ClACdGOTU
-8rtcrxP/ua5H7I2zbkHxuGE=
-=gpJG
+iD8DBQFD0R3bomPajV0RnrERAuEPAJ9nw+F9WojyOYIw+BgVP9wEK0WtFgCfS8k5
+r/LFI0uGSGexfqUW+EcaH2Q=
+=uZnr
 -----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-0.4.0-r1.ebuild b/app-text/evince/evince-0.4.0-r1.ebuild
deleted file mode 100644
index 6efa5e258ddb..000000000000
--- a/app-text/evince/evince-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/09/13 15:01:59 dang Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="http://www.gnome.org/projects/evince/"
-LICENSE="GPL-2"
-
-IUSE="dbus doc dvi t1lib tiff"
-# For use.local.desc:
-# app-text/evince:t1lib - Enable Type1 fonts support in .dvi files
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dvi? ( app-text/tetex )
-	dvi? ( t1lib? ( >=media-libs/t1lib-5.0.0 ) )
-	dbus? ( >=sys-apps/dbus-0.33 )
-	tiff? ( media-libs/tiff )
-	>=app-text/poppler-0.4.1
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-libs/glib-2
-	>=gnome-base/gnome-vfs-2.0
-	gnome-base/libgnome
-	>=gnome-base/libgnomeprintui-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=x11-libs/gtk+-2.8
-	virtual/x11
-	"
-
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.30"
-
-PROVIDE="virtual/pdfviewer
-	virtual/psviewer"
-
-G2CONF="${G2CONF} \
-	$(use_enable dvi) \
-	$(use_enable t1lib) \
-	$(use_enable dbus) \
-	$(use_enable tiff) \
-	--disable-deprecated"
-
-USE_DESTDIR="yes"
-ELTCONF="--portage"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-t1lib_is_t1.patch
-	# Fix .desktop file so menu item shows up
-	epatch ${FILESDIR}/${P}-display-menu.patch
-	automake || die "automake failed"
-	gnome2_omf_fix ${S}/help/Makefile.in
-	autoconf || die "autoconf failed"
-	libtoolize --force || die "libtoolize failed"
-}
-
-src_install() {
-	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
-}
-
-
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/app-text/evince/evince-0.4.0-r2.ebuild b/app-text/evince/evince-0.5.0.ebuild
index d92e8adf9f2f..0c1f1e0835c3 100644
--- a/app-text/evince/evince-0.4.0-r2.ebuild
+++ b/app-text/evince/evince-0.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-r2.ebuild,v 1.9 2005/12/26 15:16:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.5.0.ebuild,v 1.1 2006/01/20 17:28:15 dang Exp $
 
 inherit eutils gnome2
 
@@ -10,18 +10,18 @@ LICENSE="GPL-2"
 
 # TODO: Use 'gnome' flag instead of 'nautilus'
 IUSE="dbus doc dvi nautilus t1lib tiff"
-# For use.local.desc:
-# app-text/evince:t1lib - Enable Type1 fonts support in .dvi files
 
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="
-	dvi? ( app-text/tetex )
-	dvi? ( t1lib? ( >=media-libs/t1lib-5.0.0 ) )
+	dvi? (
+		app-text/tetex
+		t1lib? ( >=media-libs/t1lib-5.0.0 )
+	)
 	dbus? ( >=sys-apps/dbus-0.33 )
 	tiff? ( >=media-libs/tiff-3.6 )
-	>=app-text/poppler-0.4.1
+	>=app-text/poppler-bindings-0.5.0
 	>=dev-libs/glib-2
 	>=gnome-base/gnome-vfs-2.0
 	>=gnome-base/libglade-2
@@ -31,7 +31,8 @@ RDEPEND="
 	>=gnome-base/libgnomeui-2.6
 	nautilus? ( >=gnome-base/nautilus-2.10 )
 	>=x11-libs/gtk+-2.8
-	"
+	gnome-base/gnome-keyring
+	virtual/ghostscript"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
@@ -49,15 +50,16 @@ ELTCONF="--portage"
 
 pkg_setup() {
 	G2CONF="--disable-scrollkeeper \
+		--enable-comics		\
 		$(use_enable dvi)   \
 		$(use_enable t1lib) \
 		$(use_enable dbus)  \
 		$(use_enable tiff)  \
 		$(use_enable nautilus)"
 
-	if ! built_with_use app-text/poppler gtk; then
-		einfo "Please re-emerge app-text/poppler with the gtk USE flag set"
-		die "poppler needs gtk flag set"
+	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
 }
 
@@ -65,11 +67,8 @@ src_unpack(){
 	unpack "${A}"
 	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-t1lib_is_t1.patch
 	# Fix .desktop file so menu item shows up
-	epatch ${FILESDIR}/${P}-display-menu.patch
-	# Make tiff really optional
-	epatch ${FILESDIR}/${P}-no-tiff.patch
+	epatch ${FILESDIR}/${PN}-0.4.0-display-menu.patch
 
 	export WANT_AUTOMAKE=1.7
 	automake || die "automake failed"
diff --git a/app-text/evince/files/digest-evince-0.4.0-r1 b/app-text/evince/files/digest-evince-0.4.0-r1
deleted file mode 100644
index c35b49af3c82..000000000000
--- a/app-text/evince/files/digest-evince-0.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc41e30108bc54a345bd6ca2556ab857 evince-0.4.0.tar.bz2 891605
diff --git a/app-text/evince/files/digest-evince-0.4.0-r2 b/app-text/evince/files/digest-evince-0.4.0-r2
deleted file mode 100644
index c35b49af3c82..000000000000
--- a/app-text/evince/files/digest-evince-0.4.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc41e30108bc54a345bd6ca2556ab857 evince-0.4.0.tar.bz2 891605
diff --git a/app-text/evince/files/digest-evince-0.5.0 b/app-text/evince/files/digest-evince-0.5.0
new file mode 100644
index 000000000000..2480ba49fa6a
--- /dev/null
+++ b/app-text/evince/files/digest-evince-0.5.0
@@ -0,0 +1 @@
+MD5 9d4507c9370eec37fa96cabf80926f15 evince-0.5.0.tar.bz2 1116319