moved CONF_LIBDIR logic to use $(get_libdir) instead so that the ebuild will still use lib when CONF_LIBDIR is set, but the current version of portage doesnt have CONF_LIBDIR support

3 files changed, 31 insertions, 34 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index db5af1869607..d44a1d802703 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2004/08/27 03:10:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.36 2004/08/27 04:57:37 lv Exp $
+
+  27 Aug 2004; Travis Tilley <lv@gentoo.org> zlib-1.2.1-r3.ebuild:
+  moved CONF_LIBDIR logic to use $(get_libdir) instead so that the ebuild will
+  still use lib when CONF_LIBDIR is set, but the current version of portage
+  doesnt have CONF_LIBDIR support
 
   27 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> zlib-1.2.1-r3.ebuild:
   Stable on alpha, bug 61749.
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index c62a4053ae0c..f56bb1da2d9a 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,26 +1,26 @@
-MD5 99f531cb194f4f58eaf0e496f15b46d5 ChangeLog 5157
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b3aadcb1bf6019636f65e7cb8db85357 zlib-1.1.4-r2.ebuild 1067
-MD5 eba713fa0b9e1cfd9b6399bb41719492 zlib-1.1.4-r3.ebuild 1229
-MD5 ae016cf235049588d41c1797c8e94638 zlib-1.1.4-r4.ebuild 1311
-MD5 9b68e47c58d78250f1b610cb714fefa7 zlib-1.2.1-r1.ebuild 1309
 MD5 68d013456ea5d8427734c9bf1cf6a0b7 zlib-1.2.1-r2.ebuild 2108
+MD5 ae016cf235049588d41c1797c8e94638 zlib-1.1.4-r4.ebuild 1311
 MD5 685811c05eac951acc75ceccf8b4d992 zlib-1.2.1.ebuild 1264
-MD5 b3a9ab74a153852fbd2a30c7cb48ef50 zlib-1.2.1-r3.ebuild 2180
+MD5 9b68e47c58d78250f1b610cb714fefa7 zlib-1.2.1-r1.ebuild 1309
+MD5 eba713fa0b9e1cfd9b6399bb41719492 zlib-1.1.4-r3.ebuild 1229
+MD5 d90fb61ad477289ef8b45327a8583bf3 zlib-1.2.1-r3.ebuild 1842
+MD5 a0097641ec31164c88d30b4423fb976a ChangeLog 5411
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 a99957dc7ed74f72f833af10fd786352 files/zlib-1.1.4-build-fPIC.patch 2157
+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 63
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r1 63
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r2 63
-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 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
-MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
-MD5 f59140383ca357e19d6d16d79ce78c97 files/zlib-1.2.1-mapfile.patch 2131
 MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r3 63
+MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
+MD5 72490e2d8f00f11cd3d70f8352b2c9ad files/zlib-1.1.4-glibc.patch 323
 MD5 9cdacd156a2ba9dff840c9ce7d8433db files/zlib-1.2.1-CAN-2004-0797.patch 786
+MD5 9c2321cdb61e2d58b41a0d61a98d293b files/zlib-1.2.1-build-fPIC.patch 2252
diff --git a/sys-libs/zlib/zlib-1.2.1-r3.ebuild b/sys-libs/zlib/zlib-1.2.1-r3.ebuild
index 55398a9bb6a3..db418d8d0dfc 100644
--- a/sys-libs/zlib/zlib-1.2.1-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.1-r3.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-r3.ebuild,v 1.8 2004/08/27 03:10:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.9 2004/08/27 04:57:37 lv Exp $
 
 inherit eutils flag-o-matic
 
@@ -31,26 +31,18 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-CAN-2004-0797.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=/${CONF_LIBDIR} || die
+	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
 	make test || die
 
-	./configure --prefix=/usr --libdir=/${CONF_LIBDIR} || die
+	./configure --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
 }
 
 src_install() {
-	einstall libdir=${D}/${CONF_LIBDIR} || die
-	rm ${D}/${CONF_LIBDIR}/libz.a
+	einstall libdir=${D}/$(get_libdir) || die
+	rm ${D}/$(get_libdir)/libz.a
 	into /usr
 	dodir /usr/include
 	insinto /usr/include
@@ -72,9 +64,9 @@ src_install() {
 	# for NFS based /usr
 	into /
 	dolib libz.so.${PV}
-	( 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
+	( cd ${D}/$(get_libdir) ; chmod 755 libz.so.* )
+	dosym libz.so.${PV} /$(get_libdir)/libz.so
+	dosym libz.so.${PV} /$(get_libdir)/libz.so.1
 	# with an extra symlink at /usr/lib
-	dosym /${CONF_LIBDIR}/libz.so.${PV} /usr/${CONF_LIBDIR}/libz.so
+	dosym /$(get_libdir)/libz.so.${PV} /usr/$(get_libdir)/libz.so
 }