Do not call make with 'make CFLAGS=', as that discards flags set by the

Makefile, and breaks things, bug #28021, thanks to Denys Duchier
<duchier@ps.uni-sb.de>.

3 files changed, 55 insertions, 3 deletions

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index e836fc9f4a0f..cfed3d1e0164 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,8 +1,7 @@
-MD5 092108493821ddef061ad86166a44d5d zlib-1.1.4-r2.ebuild 1111
+MD5 91f6062db2146c9d80cd1d67fa875bde zlib-1.1.4-r2.ebuild 1091
 MD5 cad2872215ce5bf03f9a0e39d222d686 zlib-1.1.4.ebuild 970
 MD5 3d4c649e3822c61abee71f21546f115b zlib-1.1.4-r1.ebuild 1111
-MD5 1dd3a6a27c7e88a9844c42257f589362 ChangeLog 1849
-MD5 be43383b7a72ebfba5e9b708699253d7 .zlib-1.1.4-r2.ebuild.swp 12288
+MD5 7e0722e523e0dfcb7855294b6099a8f5 ChangeLog 2128
 MD5 50994a0512095579777c3fcf0382ab87 zlib-1.1.3-r3.ebuild 943
 MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-zlib-1.1.4-r1 63
 MD5 ef7737abd08b3d5ec169cda9baf51b87 files/digest-zlib-1.1.3-r3 62
diff --git a/sys-libs/zlib/files/digest-zlib-1.1.4-r2 b/sys-libs/zlib/files/digest-zlib-1.1.4-r2
new file mode 100644
index 000000000000..ac97e5a21b50
--- /dev/null
+++ b/sys-libs/zlib/files/digest-zlib-1.1.4-r2
@@ -0,0 +1 @@
+MD5 ea16358be41384870acbdc372f9db152 zlib-1.1.4.tar.bz2 147014
diff --git a/sys-libs/zlib/zlib-1.1.4-r2.ebuild b/sys-libs/zlib/zlib-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..d77d2d201fc4
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.1.4-r2.ebuild
@@ -0,0 +1,52 @@
+# 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.1.4-r2.ebuild,v 1.1 2003/10/27 20:14:21 azarah 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"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gentoo.security.patch
+}
+
+src_compile() {
+	append-flags -fPIC
+
+	./configure --shared --prefix=/usr || die
+	emake || die
+	make test || die
+
+	./configure --prefix=/usr || die
+	emake || die
+}
+
+src_install() {
+	into /usr
+	dodir /usr/include
+	insinto /usr/include
+	doins zconf.h zlib.h
+
+	dolib libz.so.${PV}
+	( cd ${D}/usr/lib ; chmod 755 libz.so.* )
+	dolib libz.a
+	dosym libz.so.${PV} /usr/lib/libz.so
+	dosym libz.so.${PV} /usr/lib/libz.so.1
+
+	doman zlib.3
+	dodoc FAQ README ChangeLog
+	docinto txt
+	dodoc algorithm.txt
+}