more cleanup for stablizing on 3.7.2

(Portage version: 2.0.51.19)

8 files changed, 9 insertions, 151 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index ae828d34d385..4f78e087ac0d 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for media-libs/tiff
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.53 2005/05/08 23:20:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.54 2005/05/09 01:09:06 nerdboy Exp $
 
   08 May 2005; Jeremy Huddleston <eradicator@gentoo.org> tiff-3.7.2.ebuild:
   Stable amd64, sparc for security bug #91584.
 
+  08 May 2005; Steve Arnold <nerdboy@gentoo.org> -files/config.site,
+  -files/tiff-3.6.1-r1-man.so.patch,
+  -files/tiff-3.7.0-sharedlibsnamefix.patch,
+  -files/tiff-3.7.0-tiff2ps_float.patch, -tiff-3.6.1-r2.ebuild,
+  tiff-3.7.2.ebuild:
+  more cleanup for stablizing on 3.7.2
+
 *tiff-3.7.2 (08 May 2005)
 
   08 May 2005; Steve Arnold <nerdboy@gentoo.org>
diff --git a/media-libs/tiff/files/config.site b/media-libs/tiff/files/config.site
deleted file mode 100644
index 31f4da21316e..000000000000
--- a/media-libs/tiff/files/config.site
+++ /dev/null
@@ -1,12 +0,0 @@
-JPEG="yes"			# yes|no configure JPEG support (see below)
-ZIP="yes"			# yes|no configure Deflate support (see below)
-HTML="yes"			# yes|no install HTML documentation
-DIR_BIN="${D}/usr/bin"		# directory for tools
-DIR_LIB="${D}/usr/lib"		# directory for libraries
-DIR_INC="${D}/usr/include"		# directory for include files
-DIR_MAN="${D}/usr/share/man"		# directory for manual pages
-
-DIRS_LIBINC="/usr/include" 
-DIR_JPEGLIB="/usr/lib"		
-DIR_GZLIB="/usr/lib"			# directory for libz
-DSOSUF="so"
diff --git a/media-libs/tiff/files/digest-tiff-3.6.1-r2 b/media-libs/tiff/files/digest-tiff-3.6.1-r2
deleted file mode 100644
index 3a7cbce504ae..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.6.1-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 b3f0ee7617593c2703755672fb1bfed3 tiff-v3.6.1.tar.gz 1072165
-MD5 2cd1c94d237d47104106de3bf4f08baa libtiff-lzw-compression-kit-1.5.tar.gz 9646
-MD5 d73911faab0e6f8e47e05841135b6885 libtiff-3.6.1-alt-bound.patch.bz2 8557
-MD5 d935326ef43f96d60f4b8e78cb96fe1c libtiff-3.6.1-alt-bound-fix2.patch.bz2 269
-MD5 7fb0f9cb001f5dc9e8c5b0e36abd30fc libtiff-3.6.1-chris-bound.patch.bz2 789
diff --git a/media-libs/tiff/files/tiff-3.6.1-r1-man.so.patch b/media-libs/tiff/files/tiff-3.6.1-r1-man.so.patch
deleted file mode 100644
index a42364bd8e61..000000000000
--- a/media-libs/tiff/files/tiff-3.6.1-r1-man.so.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- man/Makefile.in.orig	2003-12-22 00:22:15.000000000 -0800
-+++ man/Makefile.in	2004-09-19 19:05:09.858800696 -0700
-@@ -83,9 +83,9 @@
- # pathname prefix in the .so commands when setting
- # up alternate files for multi-function manual pages.
- #
--#MANDIR	= man3/
-+MANDIR	= man3/
- 
--MANTOOLS=\
-+MANTOOLS = \
- 	apps/fax2tiff.1 \
- 	apps/fax2ps.1 \
- 	apps/gif2tiff.1 \
diff --git a/media-libs/tiff/files/tiff-3.7.0-sharedlibsnamefix.patch b/media-libs/tiff/files/tiff-3.7.0-sharedlibsnamefix.patch
deleted file mode 100644
index f43f2fc85008..000000000000
--- a/media-libs/tiff/files/tiff-3.7.0-sharedlibsnamefix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- tiff-3.7.0.orig/ltmain.sh	2004-10-14 19:53:25.000000000 +0200
-+++ tiff-3.7.0/ltmain.sh	2004-10-18 14:49:01.000000000 +0200
-@@ -2862,7 +2862,7 @@
-       case $outputname in
-       lib*)
- 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
--	eval shared_ext=\"$shrext\"
-+	eval shared_ext=\"$shrext_cmds\"
- 	eval libname=\"$libname_spec\"
- 	;;
-       *)
-@@ -2874,7 +2874,7 @@
- 	if test "$need_lib_prefix" != no; then
- 	  # Add the "lib" prefix for modules if required
- 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
--	  eval shared_ext=\"$shrext\"
-+	  eval shared_ext=\"$shrext_cmds\"
- 	  eval libname=\"$libname_spec\"
- 	else
- 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -3637,7 +3637,7 @@
- 	fi
- 
- 	# Get the real and link names of the library.
--	eval shared_ext=\"$shrext\"
-+	eval shared_ext=\"$shrext_cmds\"
- 	eval library_names=\"$library_names_spec\"
- 	set dummy $library_names
- 	realname="$2"
-
diff --git a/media-libs/tiff/files/tiff-3.7.0-tiff2ps_float.patch b/media-libs/tiff/files/tiff-3.7.0-tiff2ps_float.patch
deleted file mode 100644
index 2cd668f3bc0d..000000000000
--- a/media-libs/tiff/files/tiff-3.7.0-tiff2ps_float.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tiff-3.7.0.orig/tools/tiff2ps.c	2004-10-14 18:53:28.000000000 +0100
-+++ tiff-3.7.0/tools/tiff2ps.c	2004-10-20 16:34:09.000000000 +0100
-@@ -411,7 +411,7 @@
- static void
- setupPageState(TIFF* tif, uint32* pw, uint32* ph, double* pprw, double* pprh)
- {
--	double xres = 0.0, yres = 0.0;
-+	float xres = 0.0, yres = 0.0;
- 
- 	TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, pw);
- 	TIFFGetField(tif, TIFFTAG_IMAGELENGTH, ph);
-@@ -542,7 +542,8 @@
- 	double pw, double ph, double lm, double bm, int cnt)
- {
- 	uint32 w, h;
--	double ox, oy, prw, prh;
-+	float ox, oy;
-+	double prw, prh;
- 	double scale = 1.0;
- 	double left_offset = lm * PS_UNIT_SIZE;
- 	double bottom_offset = bm * PS_UNIT_SIZE;
diff --git a/media-libs/tiff/tiff-3.6.1-r2.ebuild b/media-libs/tiff/tiff-3.6.1-r2.ebuild
deleted file mode 100644
index 5af81528ea18..000000000000
--- a/media-libs/tiff/tiff-3.6.1-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 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-r2.ebuild,v 1.5 2005/01/02 14:44:09 corsair Exp $
-
-inherit eutils
-
-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."
-HOMEPAGE="http://www.libtiff.org/"
-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
-	mirror://gentoo/libtiff-3.6.1-alt-bound.patch.bz2
-	mirror://gentoo/libtiff-3.6.1-alt-bound-fix2.patch.bz2
-	mirror://gentoo/libtiff-3.6.1-chris-bound.patch.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc-macos ppc64"
-IUSE="lzw-tiff"
-
-DEPEND=">=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.3-r2"
-
-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}/libtiff/.
-		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
-	epatch ${FILESDIR}/${PN}-3.6.1-r1-man.so.patch || die "man.so patch failed"
-
-	#security fixes for memory allocation problems and numerous integer overflows.
-	epatch ${DISTDIR}/lib${PN}-${PV}-alt-bound.patch.bz2
-	epatch ${DISTDIR}/lib${PN}-${PV}-alt-bound-fix2.patch.bz2
-	epatch ${DISTDIR}/lib${PN}-${PV}-chris-bound.patch.bz2
-}
-
-src_compile() {
-	OPTIMIZER="${CFLAGS}" ./configure --noninteractive || die
-	emake || die
-}
-
-src_install() {
-	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
-	dodoc 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."
-}
diff --git a/media-libs/tiff/tiff-3.7.2.ebuild b/media-libs/tiff/tiff-3.7.2.ebuild
index 3b9f38780fbb..7a16cf09f555 100644
--- a/media-libs/tiff/tiff-3.7.2.ebuild
+++ b/media-libs/tiff/tiff-3.7.2.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/media-libs/tiff/tiff-3.7.2.ebuild,v 1.2 2005/05/08 23:20:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.7.2.ebuild,v 1.3 2005/05/09 01:09:06 nerdboy Exp $
 
 inherit eutils
 
@@ -31,7 +31,3 @@ src_install() {
 	make install DESTDIR="${D}" || die "make install failed"
 	dodoc README TODO VERSION
 }
-
-pkg_postinst() {
-	einfo "Latest tiff with bug #91584 fixes."
-}