made zlib ebuild CONF_LIBDIR aware for installing to lib64/lib32

3 files changed, 34 insertions, 33 deletions

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/Manifest b/sys-libs/zlib/Manifest
index 5ea086cb7dd4..9c0e8f83db70 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,33 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5764e89606274d38a636c4d347ae7b0d ChangeLog 4264
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 21411ec00c027eb4c0faf5d244543206 zlib-1.1.4-r2.ebuild 1081
-MD5 0fc6b64cfdab17fda10f1944612a94b0 zlib-1.1.4-r3.ebuild 1243
+MD5 68d013456ea5d8427734c9bf1cf6a0b7 zlib-1.2.1-r2.ebuild 2108
 MD5 147679491a9dee122c073bd34242dbf4 zlib-1.1.4-r4.ebuild 1325
 MD5 d453cd7d8ad003acd508671e76c690e1 zlib-1.2.1.ebuild 1278
 MD5 1c7ab96db359ad47abab4758106db097 zlib-1.2.1-r1.ebuild 1323
-MD5 7843f99760379dbd2951c560e58c4b0f zlib-1.2.1-r2.ebuild 1687
-MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r2 63
-MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r3 63
-MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r4 63
-MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1 63
+MD5 0fc6b64cfdab17fda10f1944612a94b0 zlib-1.1.4-r3.ebuild 1243
+MD5 ad95e95877f13a3b8ad2b46f0d51021a ChangeLog 4391
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a99957dc7ed74f72f833af10fd786352 files/zlib-1.1.4-build-fPIC.patch 2157
-MD5 c8c569db61c8c3d4c6b0a781c188a2c8 files/zlib-1.1.4-gentoo.security.patch 10190
-MD5 72490e2d8f00f11cd3d70f8352b2c9ad files/zlib-1.1.4-glibc.patch 323
-MD5 d11cf0bd8fc84eb7a006583ade1ce3c4 files/zlib-1.1.4-gzprintf.patch 7436
-MD5 58b797a8da0e12e6cebaa0140f6493df files/zlib-1.1.4-mapfile.patch 1876
-MD5 9c2321cdb61e2d58b41a0d61a98d293b files/zlib-1.2.1-build-fPIC.patch 2252
+MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1 63
 MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
+MD5 d11cf0bd8fc84eb7a006583ade1ce3c4 files/zlib-1.1.4-gzprintf.patch 7436
 MD5 f59140383ca357e19d6d16d79ce78c97 files/zlib-1.2.1-mapfile.patch 2131
+MD5 58b797a8da0e12e6cebaa0140f6493df files/zlib-1.1.4-mapfile.patch 1876
+MD5 c8c569db61c8c3d4c6b0a781c188a2c8 files/zlib-1.1.4-gentoo.security.patch 10190
+MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r2 63
+MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r3 63
+MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r4 63
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r1 63
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r2 63
 MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA/0tGHTu7gpaalycRAlS1AJ9l/LnC0EyhMt82ovx0+ovs5MbyPgCfTqlj
-0fv+G75gCjuqAalW1yQM8Pg=
-=cHAG
------END PGP SIGNATURE-----
+MD5 72490e2d8f00f11cd3d70f8352b2c9ad files/zlib-1.1.4-glibc.patch 323
+MD5 9c2321cdb61e2d58b41a0d61a98d293b files/zlib-1.2.1-build-fPIC.patch 2252
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
 }