4 files changed, 76 insertions, 4 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 2486f8823dbd..2f7d0e4a9ae6 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.20 2003/12/21 09:45:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.21 2003/12/23 10:57:13 robbat2 Exp $
+
+*zlib-1.2.1-r2 (23 Dec 2003)
+
+  23 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> zlib-1.2.1-r2.ebuild:
+  fix bug #36333.
 
 *zlib-1.2.1-r1 (21 Dec 2003)
 
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 58ca9464d37d..ab911077ac6e 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,11 +1,11 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/Manifest,v 1.22 2003/12/23 10:57:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/Manifest,v 1.23 2003/12/23 10:57:20 robbat2 Exp $
 MD5 c4e38da0c9d2a30fd8ff4da0639abec4 zlib-1.1.4-r2.ebuild 1090
-MD5 37d02fcf435bab36a9f5f4c70053ec1c zlib-1.2.1-r2.ebuild 1467
+MD5 a901b30523e5f82f07d3249034bca2ad zlib-1.2.1-r2.ebuild 1561
 MD5 7702fd456b70d4a67252cedeb28c655e zlib-1.1.4-r4.ebuild 1335
 MD5 1c205ae462fe64d2dacacfb159c01150 zlib-1.2.1.ebuild 1291
 MD5 4237b2c4f14848f52b3bb0fd44c5599b zlib-1.2.1-r1.ebuild 1334
 MD5 f344d422056765d631bb5dbc46fc4687 zlib-1.1.4-r3.ebuild 1258
-MD5 575afa0aba4915a7f42388dd02a5c62c ChangeLog 3351
+MD5 9522e23296842a94e8c7e2610d1b511a ChangeLog 3475
 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
diff --git a/sys-libs/zlib/files/digest-zlib-1.2.1-r2 b/sys-libs/zlib/files/digest-zlib-1.2.1-r2
new file mode 100644
index 000000000000..9f6b96487246
--- /dev/null
+++ b/sys-libs/zlib/files/digest-zlib-1.2.1-r2
@@ -0,0 +1 @@
+MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
diff --git a/sys-libs/zlib/zlib-1.2.1-r2.ebuild b/sys-libs/zlib/zlib-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..698d62985d21
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.1-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/12/23 10:57:13 robbat2 Exp $
+
+inherit eutils flag-o-matic
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Standard (de)compression library"
+SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2"
+HOMEPAGE="http://www.gzip.org/zlib"
+
+LICENSE="ZLIB"
+KEYWORDS="amd64 ~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64 ~ppc64"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Make sure we link with glibc at all times
+	epatch ${FILESDIR}/${P}-glibc.patch
+	# Needed for Alpha and prelink
+	epatch ${FILESDIR}/${P}-build-fPIC.patch
+	# Only export global symbols, bug #32764
+	epatch ${FILESDIR}/${P}-mapfile.patch
+}
+
+src_compile() {
+	./configure --shared --prefix=/usr --libdir=/lib || die
+	emake || die
+	make test || die
+
+	./configure --prefix=/usr --libdir=/lib || die
+	emake || die
+}
+
+src_install() {
+	einstall libdir=${D}/lib || die
+	into /usr
+	dodir /usr/include
+	insinto /usr/include
+	doins zconf.h zlib.h
+
+	doman zlib.3
+	dodoc FAQ README ChangeLog
+	docinto txt
+	dodoc algorithm.txt
+
+	# we don't need the static lib in /lib
+	# as it's only for compiling against
+	into /usr
+	dolib libz.a
+
+	# all the shared libs go into /lib
+	# 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
+	# with an extra symlink at /usr/lib
+	dosym /lib/libz.so.${PV} /usr/lib/libz.so
+
+}