more or less fixed bugs 48694 and 48077

7 files changed, 117 insertions, 4 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 2ba3ddfebf8a..df7941f1ae60 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/tiff
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.16 2004/04/17 08:09:19 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.17 2004/04/25 08:23:46 nerdboy Exp $
+
+*tiff-3.5.5 (25 Apr 2004)
+
+  25 Apr 2004; Steve Arnold <nerdboy@gentoo.org> tiff-3.5.5.ebuild, 
+  tiff-3.6.1-r1.ebuild:
+  added lzw-compression to 3.6.1-r1 and resurrected 3.5.5 for hylafax
+  addresses bugs 48694 and 48077
 
   17 Apr 2004; Travis Tilley <lv@gentoo.org> tiff-3.6.1.ebuild:
   marked stable on amd64
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 0b601981028b..432748cc6b00 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,11 +1,15 @@
-MD5 536abf466a0bab3133716374244446e3 ChangeLog 2213
+MD5 f964e2e6ba07071a30018a6deceb216e ChangeLog 2437
 MD5 64492b5913ad38592f6eb04b5953cf89 tiff-3.5.7-r1.ebuild 1051
-MD5 2dcbdc719b9c4158d846c56df2ed3e02 tiff-3.6.0.ebuild 1093
 MD5 4bb189d68a23aa8aecb6224b66b19efb tiff-3.6.0_beta2.ebuild 1089
+MD5 2dcbdc719b9c4158d846c56df2ed3e02 tiff-3.6.0.ebuild 1093
 MD5 84c389b2919b13d74c2bd2b7f6a4617b tiff-3.6.1.ebuild 1083
+MD5 26f6de03f655f7c7b59d694a76e60f45 tiff-3.5.5.ebuild 1253
+MD5 d0d28fb31a5abb9d3053c0323e30e674 tiff-3.6.1-r1.ebuild 1689
 MD5 eb56b1622d6a778c616bfb2453471ce1 files/config.site 488
 MD5 eb56b1622d6a778c616bfb2453471ce1 files/config.site-3.5.6_beta 488
 MD5 5e55504066911b414c36963ad6ca9070 files/digest-tiff-3.5.7-r1 63
-MD5 6e51a8db6b120904c1e2ddb0f0eaf349 files/digest-tiff-3.6.0 64
 MD5 0bdb0f11a1ee24db3e7fc07875ca4c44 files/digest-tiff-3.6.0_beta2 70
+MD5 6e51a8db6b120904c1e2ddb0f0eaf349 files/digest-tiff-3.6.0 64
 MD5 f53e1604a1fd165e2e83afca8a3e63aa files/digest-tiff-3.6.1 64
+MD5 9401ca061c9d5140dfbefbac98d58212 files/digest-tiff-3.6.1-r1 145
+MD5 cc09334404bed71d88cbee093ecfbea3 files/digest-tiff-3.5.5 63
diff --git a/media-libs/tiff/files/digest-tiff-3.5.5 b/media-libs/tiff/files/digest-tiff-3.5.5
new file mode 100644
index 000000000000..5ab87cd89dfa
--- /dev/null
+++ b/media-libs/tiff/files/digest-tiff-3.5.5
@@ -0,0 +1 @@
+MD5 407d65a98c7621ad6e2c64cd3d1e7a40 tiff-v3.5.5.tar.gz 900890
diff --git a/media-libs/tiff/files/digest-tiff-3.6.1-r1 b/media-libs/tiff/files/digest-tiff-3.6.1-r1
new file mode 100644
index 000000000000..88102d56ce8e
--- /dev/null
+++ b/media-libs/tiff/files/digest-tiff-3.6.1-r1
@@ -0,0 +1,2 @@
+MD5 b3f0ee7617593c2703755672fb1bfed3 tiff-v3.6.1.tar.gz 1072165
+MD5 2cd1c94d237d47104106de3bf4f08baa libtiff-lzw-compression-kit-1.5.tar.gz 9646
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
new file mode 100644
index 000000000000..20ce219711a2
--- /dev/null
+++ b/media-libs/tiff/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+</pkgmetadata>
diff --git a/media-libs/tiff/tiff-3.5.5.ebuild b/media-libs/tiff/tiff-3.5.5.ebuild
new file mode 100644
index 000000000000..8ff409baae49
--- /dev/null
+++ b/media-libs/tiff/tiff-3.5.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/25 08:23:46 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/old/${MY_P}.tar.gz"
+HOMEPAGE="http://www.libtiff.org/"
+
+DEPEND=">=media-libs/jpeg-6b
+	>=sys-libs/zlib-1.1.3-r2"
+
+IUSE=""
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
+
+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 died"
+}
+
+src_install() {
+	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
+	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
+}
+
+pkg_postinst() {
+	einfo "This version was resurrected to work around a bug in fax2tiff"
+	einfo "for use with Hylafax.  See bug #48077 for more info."
+}
\ No newline at end of file
diff --git a/media-libs/tiff/tiff-3.6.1-r1.ebuild b/media-libs/tiff/tiff-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..f7adb2895423
--- /dev/null
+++ b/media-libs/tiff/tiff-3.6.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/25 08:23:46 nerdboy Exp $
+
+MY_S=${P/tiff-/tiff-v}
+MY_P=${PN}-v${PV/_beta/-beta}
+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
+	ftp://ftp.remotesensing.org/libtiff/libtiff-lzw-compression-kit-1.5.tar.gz"
+HOMEPAGE="http://www.libtiff.org/"
+
+DEPEND=">=media-libs/jpeg-6b
+	>=sys-libs/zlib-1.1.3-r2"
+
+IUSE="lzw-tiff"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa mips amd64 ~ia64"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	if [ "`use lzw-tiff`" ]; then
+		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 README-LZW-COMPRESSION ${S}/.
+	fi
+	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
+	emake || die
+}
+
+src_install() {
+	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
+	dodir /usr/share/doc/${PF}/html
+	make ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
+	preplib /usr
+	dodoc COPYRIGHT README TODO VERSION README-LZW-COMPRESSION
+}
+
+pkg_postinst() {
+	einfo "The LZW Compression Toolkit is now an optional component"
+	einfo "of libtiff.  Add USE="lzw-tiff" to the emerge command to enable."
+	ewarn "And don't forget to see README-LZW-COMPRESSION for license info."
+}