Version bump #69920 by Tobias Sager.

5 files changed, 178 insertions, 5 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 55e9327c0963..a1ec42ad0ca8 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2004/09/03 18:24:08 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.39 2004/11/04 00:27:54 vapier Exp $
+
+*zlib-1.2.2 (03 Nov 2004)
+
+  03 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/zlib-1.2.2-mapfile.patch, +zlib-1.2.2.ebuild:
+  Version bump #69920 by Tobias Sager.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   zlib-1.1.4-r4.ebuild, zlib-1.2.1-r2.ebuild:
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 74577713b023..4cd51c1787d9 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,9 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 681edbadf1b1f6ee2ee238b597028ab9 ChangeLog 5929
+MD5 38e595116c5c8cc472efdd526104650b ChangeLog 6099
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 0d33525c9a23859b048f3537e3bb4a3d zlib-1.2.1-r3.ebuild 1989
+MD5 e6492f173c15ff8764f9a7c4ebd46520 zlib-1.2.2.ebuild 1986
+MD5 3ccc7437df1921bba1a37d42a70e711f files/digest-zlib-1.2.2 63
+MD5 40634a4cbdcd9c795cfc34473c76038c files/zlib-1.2.2-mapfile.patch 2139
 MD5 9c2321cdb61e2d58b41a0d61a98d293b files/zlib-1.2.1-build-fPIC.patch 2252
 MD5 f84d68bd9a614ad5495a369cb258cf8d files/zlib-1.2.1-glibc.patch 395
 MD5 f59140383ca357e19d6d16d79ce78c97 files/zlib-1.2.1-mapfile.patch 2131
@@ -14,7 +17,7 @@ MD5 a337d1727a4f6f9ed8d29e43cde40e89 files/zlib-1.2.1-fPIC.patch 662
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBVOzpHTu7gpaalycRAkcVAJ4hY3xZRSyHrOedBL7BlU9E5tyILACeMxMy
-a6OHiUx2QTaamoZEUwrAM8o=
-=/iuC
+iD8DBQFBiXeyHTu7gpaalycRAhSqAJwIVPK0bKjj5VLC9emunCB+KSpczACdEwmA
+OfNfrQhcUM+CsS8LEwqgyaE=
+=hye5
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/files/digest-zlib-1.2.2 b/sys-libs/zlib/files/digest-zlib-1.2.2
new file mode 100644
index 000000000000..5f8e75741a93
--- /dev/null
+++ b/sys-libs/zlib/files/digest-zlib-1.2.2
@@ -0,0 +1 @@
+MD5 1b8aab042d40979e456194c468fd72c5 zlib-1.2.2.tar.bz2 371728
diff --git a/sys-libs/zlib/files/zlib-1.2.2-mapfile.patch b/sys-libs/zlib/files/zlib-1.2.2-mapfile.patch
new file mode 100644
index 000000000000..82ad8322081c
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.2-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* | OS/2* )
+              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.2.2.ebuild b/sys-libs/zlib/zlib-1.2.2.ebuild
new file mode 100644
index 000000000000..d24684ded461
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.2.ebuild
@@ -0,0 +1,75 @@
+# 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.2.ebuild,v 1.1 2004/11/04 00:27:54 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="http://www.gzip.org/zlib/"
+SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2
+	http://www.zlib.net/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="build"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-devel/binutils-2.14.90.0.6"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Make sure we link with glibc at all times
+	epatch ${FILESDIR}/${PN}-1.2.1-glibc.patch
+	# Needed for Alpha and prelink
+	epatch ${FILESDIR}/${PN}-1.2.1-build-fPIC.patch
+	# Only export global symbols, bug #32764
+	epatch ${FILESDIR}/${P}-mapfile.patch
+	# The configure script can be kind of dumb #55434
+	epatch ${FILESDIR}/${PN}-1.2.1-configure.patch
+	# fix shared library test on -fPIC dependant archs
+	epatch ${FILESDIR}/${PN}-1.2.1-fPIC.patch
+}
+
+src_compile() {
+	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
+	emake || die
+	make test || die
+
+	./configure --prefix=/usr --libdir=/$(get_libdir) || die
+	emake || die
+}
+
+src_install() {
+	einstall libdir=${D}/$(get_libdir) || die
+	rm ${D}/$(get_libdir)/libz.a
+	into /usr
+	dodir /usr/include
+	insinto /usr/include
+	doins zconf.h zlib.h
+
+	if ! use build ; then
+		doman zlib.3
+		dodoc FAQ README ChangeLog
+		docinto txt
+		dodoc algorithm.txt
+	fi
+
+	# 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}/$(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 /$(get_libdir)/libz.so.${PV} /usr/$(get_libdir)/libz.so
+}