killed several tiff bugs - 53328, 58699, 58699

10 files changed, 77 insertions, 24 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 9df55a995649..1daf78fa7113 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/tiff
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.23 2004/08/19 02:25:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.24 2004/09/17 04:31:40 nerdboy Exp $
+
+*tiff-3.5.7-r2 (16 Sep 2004)
+
+  16 Sep 2004; Steve Arnold <nerdboy@gentoo.org> tiff-3.5.5.ebuild,
+  tiff-3.5.7-r1.ebuild, +tiff-3.5.7-r2.ebuild, tiff-3.6.0.ebuild,
+  tiff-3.6.0_beta2.ebuild, tiff-3.6.1-r1.ebuild, tiff-3.6.1.ebuild:
+  updated all (slapped bug 64132) and the latest x86 and ~x86 (bugs 53328 and
+  58699).  3.5.7-r2 has new local USE flag for bug 58699.
 
   18 Aug 2004; Aron Griffis <agriffis@gentoo.org> tiff-3.6.1-r1.ebuild:
   stable on alpha and ia64
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 11bb4fbdc76d..5428264081f1 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,11 +1,12 @@
-MD5 f96792ed4d07f4118cfa0095f3a13bd4 ChangeLog 2915
+MD5 9e21cc02fc1be635a96ec64759c3203f ChangeLog 3283
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 66ec63f628c88a4e6c14cb5d96923e9b tiff-3.5.5.ebuild 1668
-MD5 f8bb4ded50738187b2a16f4b02acc81d tiff-3.5.7-r1.ebuild 1044
-MD5 1650fc1d3fe550af92bbf6e68e9a53f0 tiff-3.6.0.ebuild 1087
-MD5 57f226992d36ad31e5641f0cb5f860e3 tiff-3.6.0_beta2.ebuild 1080
-MD5 4ca5ab480f4b4c5ff0c27aa680ed3ce9 tiff-3.6.1-r1.ebuild 1694
-MD5 91f59769fb510dd9cbea004e4ff6b0c9 tiff-3.6.1.ebuild 1080
+MD5 c31d9d63858dbe4359a2fe322cf9270a tiff-3.5.5.ebuild 1694
+MD5 6ef6236d88b8697f8a0d0cd0c137fbe9 tiff-3.5.7-r1.ebuild 1088
+MD5 1f5924fda085dbb6d5cde797be448269 tiff-3.6.0.ebuild 1076
+MD5 6541afecc746d30a44f0d28b7ba912d3 tiff-3.6.0_beta2.ebuild 1069
+MD5 29e2e3d047efd363e79e21681baf7a12 tiff-3.6.1-r1.ebuild 1691
+MD5 d219bd7d9f4ff3a5380d73f9b7943a8e tiff-3.6.1.ebuild 1069
+MD5 0f539d87b6bbcccd29b4e881d7572fe7 tiff-3.5.7-r2.ebuild 1247
 MD5 eb56b1622d6a778c616bfb2453471ce1 files/config.site 488
 MD5 eb56b1622d6a778c616bfb2453471ce1 files/config.site-3.5.6_beta 488
 MD5 cc09334404bed71d88cbee093ecfbea3 files/digest-tiff-3.5.5 63
@@ -14,3 +15,4 @@ MD5 6e51a8db6b120904c1e2ddb0f0eaf349 files/digest-tiff-3.6.0 64
 MD5 0bdb0f11a1ee24db3e7fc07875ca4c44 files/digest-tiff-3.6.0_beta2 70
 MD5 f53e1604a1fd165e2e83afca8a3e63aa files/digest-tiff-3.6.1 64
 MD5 9401ca061c9d5140dfbefbac98d58212 files/digest-tiff-3.6.1-r1 145
+MD5 5e55504066911b414c36963ad6ca9070 files/digest-tiff-3.5.7-r2 63
diff --git a/media-libs/tiff/files/digest-tiff-3.5.7-r2 b/media-libs/tiff/files/digest-tiff-3.5.7-r2
new file mode 100644
index 000000000000..83cf7f85cd29
--- /dev/null
+++ b/media-libs/tiff/files/digest-tiff-3.5.7-r2
@@ -0,0 +1 @@
+MD5 82243b5ae9b7c9e492aeebc501680990 tiff-v3.5.7.tar.gz 951139
diff --git a/media-libs/tiff/tiff-3.5.5.ebuild b/media-libs/tiff/tiff-3.5.5.ebuild
index d0a35e40cd64..9d681df944e5 100644
--- a/media-libs/tiff/tiff-3.5.5.ebuild
+++ b/media-libs/tiff/tiff-3.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.5.ebuild,v 1.3 2004/06/24 23:24:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.5.ebuild,v 1.4 2004/09/17 04:31:40 nerdboy Exp $
 
 MY_P=${P/tiff-/tiff-v}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,8 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/${PF}}
+	dodir /usr/{bin,lib,share/man,share/doc}
+	dodir /usr/share/doc/${PF}/html
 	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die "install failed"
 	preplib /usr
 	dodoc COPYRIGHT README TODO VERSION
diff --git a/media-libs/tiff/tiff-3.5.7-r1.ebuild b/media-libs/tiff/tiff-3.5.7-r1.ebuild
index c4a6b2659b22..acdc32c14ca9 100644
--- a/media-libs/tiff/tiff-3.5.7-r1.ebuild
+++ b/media-libs/tiff/tiff-3.5.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.7-r1.ebuild,v 1.17 2004/06/24 23:24:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.7-r1.ebuild,v 1.18 2004/09/17 04:31:40 nerdboy Exp $
 
 MY_P=${P/tiff-/tiff-v}
 S=${WORKDIR}/${MY_P}
@@ -24,14 +24,14 @@ src_unpack() {
 }
 
 src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die
-	emake || die
+	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die "configure failed"
+	emake || die "emake barfed"
 }
 
 src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
+	dodir /usr/{bin,lib,share/man,share/doc}
 	dodir /usr/share/doc/${PF}/html
-	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
+	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die "make install failed"
 	preplib /usr
 	dodoc COPYRIGHT README TODO VERSION
 }
diff --git a/media-libs/tiff/tiff-3.5.7-r2.ebuild b/media-libs/tiff/tiff-3.5.7-r2.ebuild
new file mode 100644
index 000000000000..268ec0961a57
--- /dev/null
+++ b/media-libs/tiff/tiff-3.5.7-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.7-r2.ebuild,v 1.1 2004/09/17 04:31:40 nerdboy Exp $
+
+MY_P=${P/tiff-/tiff-v}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images."
+SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
+HOMEPAGE="http://www.libtiff.org/"
+
+DEPEND=">=media-libs/jpeg-6b
+	>=sys-libs/zlib-1.1.3-r2"
+
+IUSE="private"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp ${FILESDIR}/config.site config.site
+	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
+}
+
+src_compile() {
+	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die "configure failed"
+	emake || die "emake barfed"
+}
+
+src_install() {
+	dodir /usr/{bin,lib,share/man,share/doc}
+	dodir /usr/share/doc/${PF}/html
+	if use private ; then
+	    make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install-private || die "make install-private failed"
+	else
+	    make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die "make install failed"
+	fi
+	preplib /usr
+	dodoc COPYRIGHT README TODO VERSION
+}
diff --git a/media-libs/tiff/tiff-3.6.0.ebuild b/media-libs/tiff/tiff-3.6.0.ebuild
index 3f5f5ca11f2f..eb28580b20aa 100644
--- a/media-libs/tiff/tiff-3.6.0.ebuild
+++ b/media-libs/tiff/tiff-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.0.ebuild,v 1.7 2004/06/24 23:24:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.0.ebuild,v 1.8 2004/09/17 04:31:40 nerdboy Exp $
 
 MY_S=${P/tiff-/tiff-v}
 MY_P=${PN}-v${PV/_beta/-beta}
@@ -30,7 +30,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
+	dodir /usr/{bin,lib,share/man,share/doc/}
 	dodir /usr/share/doc/${PF}/html
 	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
 	preplib /usr
diff --git a/media-libs/tiff/tiff-3.6.0_beta2.ebuild b/media-libs/tiff/tiff-3.6.0_beta2.ebuild
index 772f9248ceed..745286ccee2b 100644
--- a/media-libs/tiff/tiff-3.6.0_beta2.ebuild
+++ b/media-libs/tiff/tiff-3.6.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.0_beta2.ebuild,v 1.7 2004/06/24 23:24:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.0_beta2.ebuild,v 1.8 2004/09/17 04:31:40 nerdboy Exp $
 
 MY_S=${P/tiff-/tiff-v}
 MY_P=${PN}-v${PV/_beta/-beta}
@@ -30,7 +30,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
+	dodir /usr/{bin,lib,share/man,share/doc/}
 	dodir /usr/share/doc/${PF}/html
 	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
 	preplib /usr
diff --git a/media-libs/tiff/tiff-3.6.1-r1.ebuild b/media-libs/tiff/tiff-3.6.1-r1.ebuild
index 8132fb0a8aaa..9687b6e9162b 100644
--- a/media-libs/tiff/tiff-3.6.1-r1.ebuild
+++ b/media-libs/tiff/tiff-3.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.1-r1.ebuild,v 1.8 2004/09/16 02:08:25 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.1-r1.ebuild,v 1.9 2004/09/17 04:31:40 nerdboy Exp $
 
 MY_S=${P/tiff-/tiff-v}
 MY_P=${PN}-v${PV/_beta/-beta}
@@ -24,7 +24,7 @@ src_unpack() {
 		ewarn "Applying lzw-compression toolkit..."
 		unpack  libtiff-lzw-compression-kit-1.5.tar.gz || die "lzw unpack failed"
 		cd libtiff-lzw-compression-kit-1.5/
-		cp -f tif_lzw.c ${S}/.
+		cp -f tif_lzw.c ${S}/libtiff/.
 		cp README-LZW-COMPRESSION ${S}/.
 	fi
 	cd ${S}
@@ -38,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
+	dodir /usr/{bin,lib,share/man,share/doc/}
 	dodir /usr/share/doc/${PF}/html
 	ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" make install || die
 	preplib /usr
diff --git a/media-libs/tiff/tiff-3.6.1.ebuild b/media-libs/tiff/tiff-3.6.1.ebuild
index b6daf97943d1..53a92ef2ad5a 100644
--- a/media-libs/tiff/tiff-3.6.1.ebuild
+++ b/media-libs/tiff/tiff-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.1.ebuild,v 1.5 2004/06/24 23:24:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.1.ebuild,v 1.6 2004/09/17 04:31:40 nerdboy Exp $
 
 MY_S=${P/tiff-/tiff-v}
 MY_P=${PN}-v${PV/_beta/-beta}
@@ -30,7 +30,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
+	dodir /usr/{bin,lib,share/man,share/doc/}
 	dodir /usr/share/doc/${PF}/html
 	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
 	preplib /usr