From 2cdc3145e9d6baafb29cc3e662058a429f8bb7ca Mon Sep 17 00:00:00 2001
From: Travis Tilley <lv@gentoo.org>
Date: Sun, 15 Aug 2004 01:30:39 +0000
Subject: made zlib ebuild CONF_LIBDIR aware for installing to lib64/lib32

---
 sys-libs/zlib/ChangeLog            |  5 ++++-
 sys-libs/zlib/zlib-1.2.1-r2.ebuild | 26 +++++++++++++++++---------
 2 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'sys-libs/zlib')

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 7373a30d4e19..ca513e366b8b 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.28 2004/07/02 08:51:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.29 2004/08/15 01:30:39 lv Exp $
+
+  14 Aug 2004; Travis Tilley <lv@gentoo.org> zlib-1.2.1-r2.ebuild:
+  made zlib ebuild CONF_LIBDIR aware for installing to lib64/lib32
 
   02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> zlib-1.1.4-r2.ebuild,
   zlib-1.1.4-r3.ebuild, zlib-1.1.4-r4.ebuild, zlib-1.2.1-r1.ebuild,
diff --git a/sys-libs/zlib/zlib-1.2.1-r2.ebuild b/sys-libs/zlib/zlib-1.2.1-r2.ebuild
index 55955e41577e..5c32a28f2248 100644
--- a/sys-libs/zlib/zlib-1.2.1-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.1-r2.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/sys-libs/zlib/zlib-1.2.1-r2.ebuild,v 1.12 2004/07/22 05:06:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1-r2.ebuild,v 1.13 2004/08/15 01:30:39 lv Exp $
 
 inherit eutils flag-o-matic
 
@@ -29,18 +29,26 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-configure.patch
 }
 
+pkg_setup() {
+	# this adds support for installing to lib64/lib32. since only portage
+	# 2.0.51 will have this functionality supported in dolib and friends,
+	# and since it isnt expected that many profiles will define it, we need
+	# to make this variable default to lib.
+	[ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
+}
+
 src_compile() {
-	./configure --shared --prefix=/usr --libdir=/lib || die
+	./configure --shared --prefix=/usr --libdir=/${CONF_LIBDIR} || die
 	emake || die
 	make test || die
 
-	./configure --prefix=/usr --libdir=/lib || die
+	./configure --prefix=/usr --libdir=/${CONF_LIBDIR} || die
 	emake || die
 }
 
 src_install() {
-	einstall libdir=${D}/lib || die
-	rm ${D}/lib/libz.a
+	einstall libdir=${D}/${CONF_LIBDIR} || die
+	rm ${D}/${CONF_LIBDIR}/libz.a
 	into /usr
 	dodir /usr/include
 	insinto /usr/include
@@ -62,9 +70,9 @@ src_install() {
 	# for NFS based /usr
 	into /
 	dolib libz.so.${PV}
-	( cd ${D}/lib ; chmod 755 libz.so.* )
-	dosym libz.so.${PV} /lib/libz.so
-	dosym libz.so.${PV} /lib/libz.so.1
+	( cd ${D}/${CONF_LIBDIR} ; chmod 755 libz.so.* )
+	dosym libz.so.${PV} /${CONF_LIBDIR}/libz.so
+	dosym libz.so.${PV} /${CONF_LIBDIR}/libz.so.1
 	# with an extra symlink at /usr/lib
-	dosym /lib/libz.so.${PV} /usr/lib/libz.so
+	dosym /${CONF_LIBDIR}/libz.so.${PV} /usr/${CONF_LIBDIR}/libz.so
 }
-- 
cgit v1.2.3-65-gdbad