multilib fixes

4 files changed, 35 insertions, 8 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index aa03147101bd..48242c31e09e 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2004/09/20 07:05:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.26 2004/10/08 09:25:56 eradicator Exp $
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/config.site-3.6.1-r1:
+  multilib fixes
 
   19 Sep 2004; Steve Arnold <nerdboy@gentoo.org>
   +files/tiff-3.6.1-r1-man.so.patch, tiff-3.6.1-r1.ebuild:
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 969ddd646715..aa2f05dc085e 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,11 +1,14 @@
-MD5 f7e06bc680790dde50a2d7ab0134e003 ChangeLog 3423
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 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 d758a61aee7ae3013c6c8fc8d96762f6 tiff-3.6.1-r1.ebuild 1776
+MD5 5069ddbc2b32007355421e7c2df740e0 tiff-3.6.1-r1.ebuild 1980
 MD5 d219bd7d9f4ff3a5380d73f9b7943a8e tiff-3.6.1.ebuild 1069
+MD5 9e75bee19f870e1b61ebf801acc915c4 ChangeLog 3532
 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
@@ -17,3 +20,11 @@ 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
 MD5 dca7d9db2819ce30468b1a44b7575aaa files/tiff-3.6.1-r1-man.so.patch 364
+MD5 bae48bb199ec2a87e521c417819003e6 files/config.site-3.6.1-r1 355
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBZl0vArHZZzCEUG0RApiwAJ0d+k6ZGntvKi7yI51w1iyudBluTQCfesgF
+sZAItJt8AbnRBPtxE8eE6jA=
+=9xTI
+-----END PGP SIGNATURE-----
diff --git a/media-libs/tiff/files/config.site-3.6.1-r1 b/media-libs/tiff/files/config.site-3.6.1-r1
new file mode 100644
index 000000000000..1f588bd9896b
--- /dev/null
+++ b/media-libs/tiff/files/config.site-3.6.1-r1
@@ -0,0 +1,8 @@
+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="/usr/bin"		# directory for tools
+DIR_INC="/usr/include"		# directory for include files
+DIR_MAN="/usr/share/man"	# directory for manual pages
+DIRS_LIBINC="/usr/include" 
+DSOSUF="so"
diff --git a/media-libs/tiff/tiff-3.6.1-r1.ebuild b/media-libs/tiff/tiff-3.6.1-r1.ebuild
index 909ce2f1cd3b..34ea2006c555 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.10 2004/09/20 07:05:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.6.1-r1.ebuild,v 1.11 2004/10/08 09:25:56 eradicator Exp $
 
 inherit eutils
 
@@ -30,8 +30,12 @@ src_unpack() {
 		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
+	cp ${FILESDIR}/config.site-3.6.1-r1 config.site
+	echo "DIR_HTML=\"/usr/share/doc/${PF}/html\"" >> config.site
+	echo "DIR_LIB=\"/usr/$(get_libdir)\"" >> config.site
+	echo "DIR_JPEGLIB=\"/usr/$(get_libdir)\"" >> config.site
+	echo "DIR_GZLIB=\"/usr/$(get_libdir)\"" >> config.site
+
 	epatch ${FILESDIR}/${PF}-man.so.patch || die "man.so patch failed"
 }
 
@@ -41,9 +45,9 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/}
+	dodir /usr/{bin,$(get_libdir),share/man,share/doc/}
 	dodir /usr/share/doc/${PF}/html
-	ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" make install || die
+	make DESTDIR="${D}" ROOT="" INSTALL="/bin/sh ${S}/port/install.sh" install || die
 	preplib /usr
 	dodoc README TODO VERSION README-LZW-COMPRESSION
 }