Make zlib friendly with multilib by moving some stuff from src_compile to pkg_setup.

4 files changed, 35 insertions, 22 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 7b2518ec8980..fc1428eaa7ca 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.40 2005/01/03 00:30:33 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.41 2005/01/03 07:52:34 eradicator Exp $
+
+  02 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  zlib-1.2.1-r3.ebuild, zlib-1.2.2.ebuild:
+  Make zlib friendly with multilib by moving some stuff from src_compile to
+  pkg_setup.
 
   03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 037e1cce5ed4..9fc4d02c1dbd 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,13 +1,23 @@
-MD5 61c4a1979f9c8e2701dc33adba33e617 ChangeLog 6207
-MD5 9dd1db5182c00a022ca15c6d2a700e4d zlib-1.2.2.ebuild 1889
-MD5 039e1286e630c5c6a1449fd60e172a4a zlib-1.2.1-r3.ebuild 2002
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bb8409600f9fe2ce9c53578eea3d38f2 ChangeLog 6400
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3cc38cbd536bab5d5dce4b438ca5032e zlib-1.2.2.ebuild 1875
+MD5 7a36246c8e507c7b58cc856033203024 zlib-1.2.1-r3.ebuild 1959
+MD5 3ccc7437df1921bba1a37d42a70e711f files/digest-zlib-1.2.2 63
 MD5 40634a4cbdcd9c795cfc34473c76038c files/zlib-1.2.2-mapfile.patch 2139
-MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r3 63
 MD5 9c2321cdb61e2d58b41a0d61a98d293b files/zlib-1.2.1-build-fPIC.patch 2252
-MD5 3ccc7437df1921bba1a37d42a70e711f files/digest-zlib-1.2.2 63
 MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
 MD5 f59140383ca357e19d6d16d79ce78c97 files/zlib-1.2.1-mapfile.patch 2131
-MD5 a337d1727a4f6f9ed8d29e43cde40e89 files/zlib-1.2.1-fPIC.patch 662
-MD5 9cdacd156a2ba9dff840c9ce7d8433db files/zlib-1.2.1-CAN-2004-0797.patch 786
 MD5 9d3fdd73e1997aa5c823fc210f29919d files/zlib-1.2.1-configure.patch 3149
+MD5 7de93a37ee67e3ef547846118f5290ff files/digest-zlib-1.2.1-r3 63
+MD5 9cdacd156a2ba9dff840c9ce7d8433db files/zlib-1.2.1-CAN-2004-0797.patch 786
+MD5 a337d1727a4f6f9ed8d29e43cde40e89 files/zlib-1.2.1-fPIC.patch 662
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB2PnMArHZZzCEUG0RAh1VAJsGB1TdmGdXPiwvRcrlgYHRpz5XAgCfSb43
+kDiU5vthEJRgJCbAjPVvARo=
+=p6N5
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.1-r3.ebuild b/sys-libs/zlib/zlib-1.2.1-r3.ebuild
index 0e719a36abe1..175b7f167d67 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-2005 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.15 2005/01/03 00:30:33 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1-r3.ebuild,v 1.16 2005/01/03 07:52:34 eradicator Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -15,6 +15,11 @@ IUSE="build"
 
 RDEPEND="virtual/libc"
 
+pkg_setup() {
+	tc-export CC RANLIB
+	AR="$(tc-getAR) rc"
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -34,8 +39,6 @@ src_unpack() {
 }
 
 src_compile() {
-	export CC="$(tc-getCC)" AR="$(tc-getAR) rc" RANLIB="$(tc-getRANLIB)"
-
 	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
 
@@ -43,10 +46,6 @@ src_compile() {
 	emake || die
 }
 
-src_test() {
-	make test || die
-}
-
 src_install() {
 	einstall libdir=${D}/$(get_libdir) || die
 	rm "${D}"/$(get_libdir)/libz.a
diff --git a/sys-libs/zlib/zlib-1.2.2.ebuild b/sys-libs/zlib/zlib-1.2.2.ebuild
index 938b6737e108..b89fbcd9bf71 100644
--- a/sys-libs/zlib/zlib-1.2.2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.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/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.5 2005/01/03 00:30:33 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.6 2005/01/03 07:52:34 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,6 +16,11 @@ IUSE="build"
 
 RDEPEND="virtual/libc"
 
+pkg_setup() {
+	tc-export CC RANLIB
+	export AR="$(tc-getAR) rc"
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -33,16 +38,10 @@ src_unpack() {
 }
 
 src_compile() {
-	tc-export CC RANLIB
-	export AR="$(tc-getAR) rc"
 	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
 }
 
-src_test() {
-	make test || die
-}
-
 src_install() {
 	einstall libdir=${D}/$(get_libdir) || die
 	rm "${D}"/$(get_libdir)/libz.a