version bump

11 files changed, 182 insertions, 102 deletions

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 7823c4e4448f..fa0150db0e98 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,14 +1,17 @@
 MD5 91f6062db2146c9d80cd1d67fa875bde zlib-1.1.4-r2.ebuild 1091
 MD5 9e67b1100b68849d6bac089dc6cd9db4 zlib-1.1.4-r4.ebuild 1336
-MD5 9e67b1100b68849d6bac089dc6cd9db4 zlib-1.2.1.ebuild 1336
+MD5 7b50a7e4820f5c74ff1d42a59597d3ad zlib-1.2.1.ebuild 1284
 MD5 a1835c2df00dc4900aa1a9b25059762b zlib-1.1.4-r3.ebuild 1259
-MD5 e4ef1ac3e8a78e35503560db1ed36b2a ChangeLog 2814
+MD5 77f4ef87bd2f79d85a3c093011cfde96 ChangeLog 3190
 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 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/files/digest-zlib-1.1.3-r3 b/sys-libs/zlib/files/digest-zlib-1.1.3-r3
deleted file mode 100644
index 3e5ce1ef1960..000000000000
--- a/sys-libs/zlib/files/digest-zlib-1.1.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ada18615d2a66dee4d6f5ff916ecd4c6 zlib-1.1.3.tar.gz 168463
diff --git a/sys-libs/zlib/files/digest-zlib-1.1.4 b/sys-libs/zlib/files/digest-zlib-1.1.4
deleted file mode 100644
index ac97e5a21b50..000000000000
--- a/sys-libs/zlib/files/digest-zlib-1.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea16358be41384870acbdc372f9db152 zlib-1.1.4.tar.bz2 147014
diff --git a/sys-libs/zlib/files/digest-zlib-1.1.4-r1 b/sys-libs/zlib/files/digest-zlib-1.1.4-r1
deleted file mode 100644
index ac97e5a21b50..000000000000
--- a/sys-libs/zlib/files/digest-zlib-1.1.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea16358be41384870acbdc372f9db152 zlib-1.1.4.tar.bz2 147014
diff --git a/sys-libs/zlib/files/digest-zlib-1.2.1 b/sys-libs/zlib/files/digest-zlib-1.2.1
new file mode 100644
index 000000000000..9f6b96487246
--- /dev/null
+++ b/sys-libs/zlib/files/digest-zlib-1.2.1
@@ -0,0 +1 @@
+MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
diff --git a/sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch b/sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch
new file mode 100644
index 000000000000..3f122c9cfc2b
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch
@@ -0,0 +1,65 @@
+diff -urN zlib-1.2.1-old/Makefile.in zlib-1.2.1/Makefile.in
+--- zlib-1.2.1-old/Makefile.in	2003-12-02 12:14:28.000000000 -0800
++++ zlib-1.2.1/Makefile.in	2003-12-02 12:16:46.000000000 -0800
+@@ -49,6 +49,8 @@
+ OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+        zutil.o inflate.o infback.o inftrees.o inffast.o
+ 
++PIC_OBJS = $(OBJS:%.o=%.lo)
++
+ OBJA =
+ # to use the asm code: make OBJA=match.o
+ 
+@@ -77,8 +79,11 @@
+ 	mv _match.o match.o
+ 	rm -f _match.s
+ 
+-$(SHAREDLIBV): $(OBJS)
+-	$(LDSHARED) -o $@ $(OBJS) -lc
++%.lo: %.c
++	$(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@
++
++$(SHAREDLIBV): $(PIC_OBJS)
++	$(LDSHARED) -o $@ $(PIC_OBJS) -lc
+ 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
+ 	ln -s $@ $(SHAREDLIB)
+ 	ln -s $@ $(SHAREDLIBM)
+@@ -89,13 +94,10 @@
+ minigzip$(EXE): minigzip.o $(LIBS)
+ 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+ 
+-install: $(LIBS)
++install-libs: $(LIBS)
+ 	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
+-	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
+ 	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
+ 	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
+-	cp zlib.h zconf.h $(includedir)
+-	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+ 	cp $(LIBS) $(libdir)
+ 	cd $(libdir); chmod 755 $(LIBS)
+ 	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+@@ -110,6 +112,11 @@
+ # The ranlib in install is needed on NeXTSTEP which checks file times
+ # ldconfig is for Linux
+ 
++install: install-libs
++	-@if [ ! -d $(includedir)  ]; then mkdir $(includedir); fi
++	cp zlib.h zconf.h $(includedir)
++	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
++
+ uninstall:
+ 	cd $(includedir); \
+ 	cd $(libdir); rm -f libz.a; \
+diff -urN zlib-1.2.1-old/configure zlib-1.2.1/configure
+--- zlib-1.2.1-old/configure	2003-11-16 19:50:39.000000000 -0800
++++ zlib-1.2.1/configure	2003-12-02 12:18:01.000000000 -0800
+@@ -160,7 +160,7 @@
+   if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
+      test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
+     CFLAGS="$SFLAGS"
+-    LIBS="$SHAREDLIBV"
++    LIBS="$LIBS $SHAREDLIBV"
+     echo Building shared library $SHAREDLIBV with $CC.
+   elif test -z "$old_cc" -a -z "$old_cflags"; then
+     echo No shared library support.
diff --git a/sys-libs/zlib/files/zlib-1.2.1-glibc.patch b/sys-libs/zlib/files/zlib-1.2.1-glibc.patch
new file mode 100644
index 000000000000..db5e0df9fb58
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.1-glibc.patch
@@ -0,0 +1,12 @@
+diff -urN zlib-1.2.1-old/Makefile.in zlib-1.2.1/Makefile.in
+--- zlib-1.2.1-old/Makefile.in	2003-11-08 18:29:23.000000000 -0800
++++ zlib-1.2.1/Makefile.in	2003-12-02 12:12:43.000000000 -0800
+@@ -78,7 +78,7 @@
+ 	rm -f _match.s
+ 
+ $(SHAREDLIBV): $(OBJS)
+-	$(LDSHARED) -o $@ $(OBJS)
++	$(LDSHARED) -o $@ $(OBJS) -lc
+ 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
+ 	ln -s $@ $(SHAREDLIB)
+ 	ln -s $@ $(SHAREDLIBM)
diff --git a/sys-libs/zlib/files/zlib-1.2.1-mapfile.patch b/sys-libs/zlib/files/zlib-1.2.1-mapfile.patch
new file mode 100644
index 000000000000..fa0e39df92f7
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.1-mapfile.patch
@@ -0,0 +1,88 @@
+--- configure.orig	2003-12-02 12:48:03.882675272 -0800
++++ configure	2003-12-02 13:00:18.728031272 -0800
+@@ -76,7 +76,9 @@
+   SFLAGS=${CFLAGS-"-fPIC -O3"}
+   CFLAGS="$cflags"
+   case `(uname -s || echo unknown) 2>/dev/null` in
+-  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
++  Linux | linux | GNU | GNU/*)
++          LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"}
++          MAPFILE=${MAPFILE-"-Wl,--version-script,mapfile"};;
+   CYGWIN* | Cygwin* | cygwin* )
+              EXE='.exe';;
+   QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
+@@ -123,6 +125,7 @@
+              LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
+   SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
+              CFLAGS=${CFLAGS-"-fast -xcg89"}
++             MAPFILE=${MAPFILE-"-M mapfile"}
+              LDSHARED=${LDSHARED-"cc -G"};;
+   SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+              CFLAGS=${CFLAGS-"-O2"}
+@@ -169,6 +172,7 @@
+     echo 'No shared library support; try without defining CC and CFLAGS'
+     shared=0;
+   fi
++  LDSHARED="${LDSHARED} ${MAPFILE}"
+ fi
+ if test $shared -eq 0; then
+   LDSHARED="$CC"
+--- /dev/null	2003-10-15 22:31:52.000000000 -0700
++++ mapfile	2003-12-02 12:59:22.275926800 -0800
+@@ -0,0 +1,56 @@
++{
++	global:
++		zlibVersion ;
++		deflateInit_ ;
++		deflateInit2_ ;
++		deflate ;
++		deflateSetDictionary ;
++		deflateCopy ;
++		deflateReset ;
++		deflateParams ;
++		deflateEnd ;
++		deflateBound ;
++		deflatePrime ;
++		inflateInit_ ;
++		inflateInit2_ ;
++		inflate ;
++		inflateSetDictionary ;
++		inflateSync ;
++		inflateReset ;
++		inflateEnd ;
++		inflateCopy ;
++		inflateBackInit_ ;
++		inflateBack ;
++		inflateBackEnd ;
++		zlibCompileFlags ;
++		compressBound ;
++		compress ;
++		compress2 ;
++		uncompress ;
++		gzopen ;
++		gzdopen ;
++		gzsetparams ;
++		gzread ;
++		gzwrite ;
++		gzprintf ;
++		gzputs ;
++		gzgets ;
++		gzputc ;
++		gzgetc ;
++		gzungetc ;
++		gzflush ;
++		gzseek ;
++		gzrewind ;
++		gztell ;
++		gzeof ;
++		gzclose ;
++		gzerror ;
++		gzclearerr ;
++		adler32 ;
++		crc32 ;
++		zError ;
++		inflateSyncPoint ;
++		get_crc_table ;
++	local:
++		*;
++};
diff --git a/sys-libs/zlib/zlib-1.1.3-r3.ebuild b/sys-libs/zlib/zlib-1.1.3-r3.ebuild
deleted file mode 100644
index a9574b4ea2f6..000000000000
--- a/sys-libs/zlib/zlib-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.3-r3.ebuild,v 1.12 2003/06/22 05:10:31 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard (de)compression library"
-SRC_URI="ftp://ftp.freesoftware.com/pub/infozip/zlib/${P}.tar.gz"
-HOMEPAGE="http://www.gzip.org/zlib"
-LICENSE="ZLIB"
-KEYWORDS="x86 ppc sparc "
-SLOT="0"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-	./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.1.1.3
-	( cd ${D}/usr/lib ; chmod 755 libz.so.* )
-	dolib libz.a
-	dosym libz.so.1.1.3 /usr/lib/libz.so
-	dosym libz.so.1.1.3 /usr/lib/libz.so.1
-
-	doman zlib.3
-	dodoc FAQ README ChangeLog
-	docinto txt
-	dodoc algorithm.txt
-}
diff --git a/sys-libs/zlib/zlib-1.1.4.ebuild b/sys-libs/zlib/zlib-1.1.4.ebuild
deleted file mode 100644
index 62f302451285..000000000000
--- a/sys-libs/zlib/zlib-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.ebuild,v 1.18 2003/06/22 05:10:31 seemant Exp $
-
-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="x86 ppc sparc alpha mips hppa arm"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-	./configure --shared --prefix=/usr || die
-
-	emake CFLAGS="${CFLAGS} -fPIC" || 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
-}
diff --git a/sys-libs/zlib/zlib-1.1.4-r1.ebuild b/sys-libs/zlib/zlib-1.2.1.ebuild
index 6c651e61ef65..04451ad1c5d9 100644
--- a/sys-libs/zlib/zlib-1.1.4-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.7 2003/09/17 18:34:23 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.1.ebuild,v 1.1 2003/12/02 21:26:34 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,25 +10,26 @@ 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"
+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
+	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 || die
-
-	append-flags -fPIC
-
-	emake CFLAGS="${CFLAGS}" || die
-
+	emake || die
 	make test || die
 
 	./configure --prefix=/usr || die
@@ -36,6 +37,7 @@ src_compile() {
 }
 
 src_install() {
+	einstall || die
 	into /usr
 	dodir /usr/include
 	insinto /usr/include