Make tiff actually optional

(Portage version: 2.0.53_rc5)

4 files changed, 42 insertions, 8 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 600c80734a3a..f1e0a1ebaa69 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.14 2005/10/17 14:28:26 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.15 2005/10/17 15:09:44 dang Exp $
+
+  17 Oct 2005; <dang@gentoo.org> +files/evince-0.4.0-no-tiff.patch,
+  evince-0.4.0-r2.ebuild:
+  Make tiff actually optional
 
   17 Oct 2005; John N. Laliberte <allanonjl@gentoo.org>
   evince-0.4.0-r2.ebuild:
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 831b819fbc3a..fe7b5e2c4a68 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,10 +1,11 @@
-MD5 52069416ee02cc54163f313df19ecba8 evince-0.4.0.ebuild 1587
-MD5 e4d15a65822c1ff8fd89a3a2568a371f evince-0.4.0-r1.ebuild 1657
-MD5 db66524e132ed4d8266c7b0185b3b24a evince-0.4.0-r2.ebuild 1920
 MD5 5f579860e927c681384f73cca0b4d49e ChangeLog 2437
-MD5 80e3213c196ad3e4d107694f8064aad3 metadata.xml 220
-MD5 755b327b4928ab9492b7c2aab72ef52d files/evince-0.4.0-t1lib_is_t1.patch 976
-MD5 185784a35b672ed49ea8afb3aba25e30 files/evince-0.4.0-display-menu.patch 471
+MD5 e4d15a65822c1ff8fd89a3a2568a371f evince-0.4.0-r1.ebuild 1657
+MD5 59c4c7eb3d83f574ff6563d60d61ec07 evince-0.4.0-r2.ebuild 1988
+MD5 52069416ee02cc54163f313df19ecba8 evince-0.4.0.ebuild 1587
 MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0 65
 MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0-r1 65
 MD5 a8bcc7dab66f7a60936b49f43bc4e9a9 files/digest-evince-0.4.0-r2 65
+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
+MD5 80e3213c196ad3e4d107694f8064aad3 metadata.xml 220
diff --git a/app-text/evince/evince-0.4.0-r2.ebuild b/app-text/evince/evince-0.4.0-r2.ebuild
index fa1ab81f586a..cceeceb8b521 100644
--- a/app-text/evince/evince-0.4.0-r2.ebuild
+++ b/app-text/evince/evince-0.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.4 2005/10/17 14:28:26 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-0.4.0-r2.ebuild,v 1.5 2005/10/17 15:09:44 dang Exp $
 
 inherit gnome2 eutils
 
@@ -65,6 +65,8 @@ src_unpack(){
 	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
 	automake || die "automake failed"
 	gnome2_omf_fix ${S}/help/Makefile.in
 	autoconf || die "autoconf failed"
diff --git a/app-text/evince/files/evince-0.4.0-no-tiff.patch b/app-text/evince/files/evince-0.4.0-no-tiff.patch
new file mode 100644
index 000000000000..95c5050bb3f9
--- /dev/null
+++ b/app-text/evince/files/evince-0.4.0-no-tiff.patch
@@ -0,0 +1,27 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evince-0.4.0.orig/configure.ac evince-0.4.0/configure.ac
+--- evince-0.4.0.orig/configure.ac	2005-08-26 00:04:22.000000000 -0400
++++ evince-0.4.0/configure.ac	2005-10-17 10:53:11.000000000 -0400
+@@ -80,12 +80,12 @@
+ fi
+ 
+ SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS"
+-SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -ltiff -lz"
++SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -lz"
+ AC_SUBST(SHELL_CFLAGS)
+ AC_SUBST(SHELL_LIBS)
+ 
+ FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS"
+-FRONTEND_LIBS="$FRONTEND_CORE_LIBS -ltiff -lz"
++FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz"
+ AC_SUBST(FRONTEND_CFLAGS)
+ AC_SUBST(FRONTEND_LIBS)
+ 
+@@ -170,6 +170,8 @@
+     fi
+     if test "x$enable_tiff" = "xyes"; then
+ 	    AC_DEFINE([ENABLE_TIFF], [1], [Enable multipage tiff support.])
++	    FRONTEND_LIBS="$FRONTEND_LIBS -ltiff"
++	    SHELL_LIBS="$SHELL_LIBS -ltiff"
+     else
+ 	    AC_MSG_WARN("Tiff support is disabled since tiff library version 3.6 or newer not found")
+     fi