summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2018-01-17 18:17:36 +0100
committerMichael Haubenwallner <haubi@gentoo.org>2018-01-17 18:20:14 +0100
commit81e10e0ac9c9e88064a30ef66fe09e2126033242 (patch)
treecaf48a671d23f7b7be40b33b5d19b077f0686051 /sys-libs
parentbootstrap-prefix.sh: no-multilib should not be leaked into prefix-rpath (diff)
downloadprefix-81e10e0ac9c9e88064a30ef66fe09e2126033242.tar.gz
prefix-81e10e0ac9c9e88064a30ef66fe09e2126033242.tar.bz2
prefix-81e10e0ac9c9e88064a30ef66fe09e2126033242.zip
sys-libs/zlib: sync
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/zlib/Manifest2
-rw-r--r--sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch72
-rw-r--r--sys-libs/zlib/files/zlib-1.2.1-configure.patch103
-rw-r--r--sys-libs/zlib/files/zlib-1.2.1-fPIC.patch16
-rw-r--r--sys-libs/zlib/files/zlib-1.2.1-glibc.patch12
-rw-r--r--sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch67
-rw-r--r--sys-libs/zlib/files/zlib-1.2.2-mapfile.patch88
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch31
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-bsd-soname.patch15
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-build.patch66
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-mingw-implib.patch13
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-r1-bsd-soname.patch15
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-shlib-aix.patch69
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-visibility-support.patch45
-rw-r--r--sys-libs/zlib/files/zlib-1.2.4-build.patch34
-rw-r--r--sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch21
-rw-r--r--sys-libs/zlib/files/zlib-1.2.4-minizip-autotools.patch64
-rw-r--r--sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch45
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5-aix-soname.patch15
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch15
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5-ldflags.patch22
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch15
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5-static.patch16
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5.1-aix-soname.patch16
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch33
-rw-r--r--sys-libs/zlib/files/zlib-1.2.5.1-version.patch22
-rw-r--r--sys-libs/zlib/zlib-1.2.11-r1.ebuild140
27 files changed, 208 insertions, 864 deletions
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 1db6ff6315..a09e7fa455 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1 +1 @@
-DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
+DIST zlib-1.2.11.tar.gz 607698 SHA256 c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae WHIRLPOOL 4263b67dd133e9eb6a837f270a53e6083af871993c52f89a21135f188f83c58646e7aa5882d62f35370032afe7a9964dd2796c25d104b8a2a70b293a5e31f72a
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
deleted file mode 100644
index 86d05c8a61..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.1-build-fPIC.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- zlib-1.2.1/Makefile.in
-+++ zlib-1.2.1/Makefile.in
-@@ -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; \
-@@ -127,7 +127,7 @@
-
- mostlyclean: clean
- clean:
-- rm -f *.o *~ example$(EXE) minigzip$(EXE) \
-+ rm -f *.lo *.o *~ example$(EXE) minigzip$(EXE) \
- libz.* foo.gz so_locations \
- _match.s maketree contrib/infback9/*.o
-
---- zlib-1.2.1/configure
-+++ zlib-1.2.1/configure
-@@ -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-configure.patch b/sys-libs/zlib/files/zlib-1.2.1-configure.patch
deleted file mode 100644
index 477fc5c26b..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.1-configure.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- configure.orig 2004-06-29 18:49:20.065187520 -0400
-+++ configure 2004-06-29 18:52:54.142642800 -0400
-@@ -160,8 +160,8 @@
- if test $shared -eq 1; then
- echo Checking for shared library support...
- # we must test in two steps (cc then ld), required at least on SunOS 4.x
-- if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
-- test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
-+ if ($CC -c $SFLAGS $test.c) 2>/dev/null &&
-+ ($LDSHARED -o $test$shared_ext $test.o) 2>/dev/null; then
- CFLAGS="$SFLAGS"
- LIBS="$LIBS $SHAREDLIBV"
- echo Building shared library $SHAREDLIBV with $CC.
-@@ -185,7 +185,7 @@
- #include <unistd.h>
- int main() { return 0; }
- EOF
--if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h
- echo "Checking for unistd.h... Yes."
- else
-@@ -208,7 +208,7 @@
- }
- EOF
-
--if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()"
-
- cat > $test.c <<EOF
-@@ -232,7 +232,7 @@
- }
- EOF
-
-- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
-+ if ($CC $CFLAGS -o $test $test.c) 2>/dev/null; then
- echo "Checking for vsnprintf() in stdio.h... Yes."
-
- cat >$test.c <<EOF
-@@ -257,7 +257,7 @@
- }
- EOF
-
-- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+ if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- echo "Checking for return value of vsnprintf()... Yes."
- else
- CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
-@@ -295,7 +295,7 @@
- }
- EOF
-
-- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+ if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- echo "Checking for return value of vsprintf()... Yes."
- else
- CFLAGS="$CFLAGS -DHAS_vsprintf_void"
-@@ -325,7 +325,7 @@
- }
- EOF
-
-- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then
-+ if ($CC $CFLAGS -o $test $test.c) 2>/dev/null; then
- echo "Checking for snprintf() in stdio.h... Yes."
-
- cat >$test.c <<EOF
-@@ -344,7 +344,7 @@
- }
- EOF
-
-- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+ if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- echo "Checking for return value of snprintf()... Yes."
- else
- CFLAGS="$CFLAGS -DHAS_snprintf_void"
-@@ -376,7 +376,7 @@
- }
- EOF
-
-- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+ if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- echo "Checking for return value of sprintf()... Yes."
- else
- CFLAGS="$CFLAGS -DHAS_sprintf_void"
-@@ -392,7 +392,7 @@
- #include <errno.h>
- int main() { return 0; }
- EOF
--if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- echo "Checking for errno.h... Yes."
- else
- echo "Checking for errno.h... No."
-@@ -407,7 +407,7 @@
- return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0);
- }
- EOF
--if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
-+if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- CFLAGS="$CFLAGS -DUSE_MMAP"
- echo Checking for mmap support... Yes.
- else
diff --git a/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch b/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch
deleted file mode 100644
index 5ccbddfd0f..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.1-fPIC.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- zlib-1.2.1/configure
-+++ zlib-1.2.1/configure
-@@ -73,7 +73,12 @@
-
- if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
- CC="$cc"
-- SFLAGS=${CFLAGS-"-fPIC -O3"}
-+ #SFLAGS=${CFLAGS-"-fPIC -O3"}
-+ # the above is horribly wrong on a few archs where -fPIC should ALWAYS be
-+ # used in the creation of shared libraries. without the following, the
-+ # shared lib test will sometimes fail even when shared libs -can- be created.
-+ SFLAGS=${CFLAGS-"-O3"}
-+ SFLAGS="${SFLAGS} -fPIC"
- CFLAGS="$cflags"
- case `(uname -s || echo unknown) 2>/dev/null` in
- Linux | linux | GNU | GNU/*)
diff --git a/sys-libs/zlib/files/zlib-1.2.1-glibc.patch b/sys-libs/zlib/files/zlib-1.2.1-glibc.patch
deleted file mode 100644
index db5e0df9fb..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.1-glibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.11-fix-deflateParams-usage.patch b/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
new file mode 100644
index 0000000000..18764849b9
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
@@ -0,0 +1,67 @@
+From f9694097dd69354b03cb8af959094c7f260db0a1 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 16 Jan 2017 09:49:35 -0800
+Subject: [PATCH] Permit a deflateParams() parameter change as soon as
+ possible.
+
+This commit allows a parameter change even if the input data has
+not all been compressed and copied to the application output
+buffer, so long as all of the input data has been compressed to
+the internal pending output buffer. This also allows an immediate
+deflateParams change so long as there have been no deflate calls
+since initialization or reset.
+---
+ deflate.c | 6 +++---
+ zlib.h | 11 ++++++-----
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/deflate.c b/deflate.c
+index b63311a5..20bda4f6 100644
+--- a/deflate.c
++++ b/deflate.c
+@@ -494,7 +494,7 @@ int ZEXPORT deflateResetKeep (strm)
+ s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+ #endif
+ adler32(0L, Z_NULL, 0);
+- s->last_flush = Z_NO_FLUSH;
++ s->last_flush = -2;
+
+ _tr_init(s);
+
+@@ -587,12 +587,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
+ func = configuration_table[s->level].func;
+
+ if ((strategy != s->strategy || func != configuration_table[level].func) &&
+- s->high_water) {
++ s->last_flush != -2) {
+ /* Flush the last buffer: */
+ int err = deflate(strm, Z_BLOCK);
+ if (err == Z_STREAM_ERROR)
+ return err;
+- if (strm->avail_out == 0)
++ if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
+ return Z_BUF_ERROR;
+ }
+ if (s->level != level) {
+diff --git a/zlib.h b/zlib.h
+index 5daf4f28..577d81e3 100644
+--- a/zlib.h
++++ b/zlib.h
+@@ -712,11 +712,12 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+ used to switch between compression and straight copy of the input data, or
+ to switch to a different kind of input data requiring a different strategy.
+ If the compression approach (which is a function of the level) or the
+- strategy is changed, and if any input has been consumed in a previous
+- deflate() call, then the input available so far is compressed with the old
+- level and strategy using deflate(strm, Z_BLOCK). There are three approaches
+- for the compression levels 0, 1..3, and 4..9 respectively. The new level
+- and strategy will take effect at the next call of deflate().
++ strategy is changed, and if there have been any deflate() calls since the
++ state was initialized or reset, then the input available so far is
++ compressed with the old level and strategy using deflate(strm, Z_BLOCK).
++ There are three approaches for the compression levels 0, 1..3, and 4..9
++ respectively. The new level and strategy will take effect at the next call
++ of deflate().
+
+ If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+ not have enough output space to complete, then the parameter change will not
diff --git a/sys-libs/zlib/files/zlib-1.2.2-mapfile.patch b/sys-libs/zlib/files/zlib-1.2.2-mapfile.patch
deleted file mode 100644
index 82ad832208..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.2-mapfile.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- 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/files/zlib-1.2.3-LDFLAGS.patch b/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch
deleted file mode 100644
index 86da956eb5..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- zlib-1.2.3/Makefile.in
-+++ zlib-1.2.3/Makefile.in
-@@ -24,7 +24,7 @@
- #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
- # -Wstrict-prototypes -Wmissing-prototypes
-
--LDFLAGS=libz.a
-+TEST_LDFLAGS=libz.a
- LDSHARED=$(CC)
- CPP=$(CC) -E
-
-@@ -83,16 +83,16 @@
- $(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@
-
- $(SHAREDLIBV): $(PIC_OBJS)
-- $(LDSHARED) -o $@ $(PIC_OBJS) -lc
-+ $(LDSHARED) -o $@ $(PIC_OBJS) -lc $(LDFLAGS)
- rm -f $(SHAREDLIB) $(SHAREDLIBM)
- ln -s $@ $(SHAREDLIB)
- ln -s $@ $(SHAREDLIBM)
-
- example$(EXE): example.o $(LIBS)
-- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) $(TEST_LDFLAGS)
-
- minigzip$(EXE): minigzip.o $(LIBS)
-- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) $(TEST_LDFLAGS)
-
- install-libs: $(LIBS)
- -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
diff --git a/sys-libs/zlib/files/zlib-1.2.3-bsd-soname.patch b/sys-libs/zlib/files/zlib-1.2.3-bsd-soname.patch
deleted file mode 100644
index 4c98b98144..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.3-bsd-soname.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Generate a DT_SONAME on *BSD machines
-
-http://bugs.gentoo.org/123571
-
---- configure
-+++ configure
-@@ -80,7 +80,7 @@
- SFLAGS="${CFLAGS-"-O3"} -fPIC"
- CFLAGS="$cflags"
- case `(uname -s || echo unknown) 2>/dev/null` in
-- Linux | linux | GNU | GNU/*)
-+ Linux | linux | GNU | GNU/* | *BSD | DragonFly)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"}
- MAPFILE=${MAPFILE-"-Wl,--version-script,mapfile"};;
- CYGWIN* | Cygwin* | cygwin* | OS/2* )
diff --git a/sys-libs/zlib/files/zlib-1.2.3-build.patch b/sys-libs/zlib/files/zlib-1.2.3-build.patch
deleted file mode 100644
index 10435b85fb..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.3-build.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- zlib-1.2.3/configure
-+++ zlib-1.2.3/configure
-@@ -23,7 +23,7 @@
- VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
- VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
- VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
--AR=${AR-"ar rc"}
-+AR=${AR-"ar"}
- RANLIB=${RANLIB-"ranlib"}
- prefix=${prefix-/usr/local}
- exec_prefix=${exec_prefix-'${prefix}'}
---- zlib-1.2.3/Makefile.in
-+++ zlib-1.2.3/Makefile.in
-@@ -70,7 +70,7 @@
- fi
-
- libz.a: $(OBJS) $(OBJA)
-- $(AR) $@ $(OBJS) $(OBJA)
-+ $(AR) rc $@ $(OBJS) $(OBJA)
- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
- match.o: match.S
---- zlib-1.2.3/win32/Makefile.gcc
-+++ zlib-1.2.3/win32/Makefile.gcc
-@@ -30,21 +30,23 @@
- #LOC = -DASMV
- #LOC = -DDEBUG -g
-
--CC = gcc
--CFLAGS = $(LOC) -O3 -Wall
-+CC ?= gcc
-+CFLAGS ?= $(LOC) -O3 -Wall
-
--AS = $(CC)
--ASFLAGS = $(LOC) -Wall
-+AS ?= $(CC)
-+ASFLAGS ?= $(LOC) -Wall
-
- LD = $(CC)
--LDFLAGS = $(LOC) -s
-+LDFLAGS ?= $(LOC) -s
-
--AR = ar
-+AR ?= ar
- ARFLAGS = rcs
-
--RC = windres
-+RC ?= windres
- RCFLAGS = --define GCC_WINDRES
-
-+DLLWRAP ?= dllwrap
-+
- CP = cp -fp
- # If GNU install is available, replace $(CP) with install.
- INSTALL = $(CP)
-@@ -79,9 +81,8 @@
- $(IMPLIB): $(SHAREDLIB)
-
- $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-- dllwrap --driver-name $(CC) --def win32/zlib.def \
-+ $(DLLWRAP) --driver-name $(CC) --def win32/zlib.def \
- --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o
-- strip $@
-
- example: example.o $(STATICLIB)
- $(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
diff --git a/sys-libs/zlib/files/zlib-1.2.3-mingw-implib.patch b/sys-libs/zlib/files/zlib-1.2.3-mingw-implib.patch
deleted file mode 100644
index 9726237d56..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.3-mingw-implib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/288212
-
---- zlib-1.2.3/win32/Makefile.gcc
-+++ zlib-1.2.3/win32/Makefile.gcc
-@@ -25,7 +25,7 @@
-
- STATICLIB = libz.a
- SHAREDLIB = zlib1.dll
--IMPLIB = libzdll.a
-+IMPLIB = libz.dll.a
-
- #LOC = -DASMV
- #LOC = -DDEBUG -g
diff --git a/sys-libs/zlib/files/zlib-1.2.3-r1-bsd-soname.patch b/sys-libs/zlib/files/zlib-1.2.3-r1-bsd-soname.patch
deleted file mode 100644
index 872070b030..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.3-r1-bsd-soname.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Generate a DT_SONAME on *BSD machines
-
-http://bugs.gentoo.org/123571
-
---- configure
-+++ configure
-@@ -80,7 +80,7 @@
- SFLAGS="${CFLAGS-"-O3"} -fPIC"
- 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/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
- CYGWIN* | Cygwin* | cygwin* | OS/2* )
- EXE='.exe';;
- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
diff --git a/sys-libs/zlib/files/zlib-1.2.3-shlib-aix.patch b/sys-libs/zlib/files/zlib-1.2.3-shlib-aix.patch
deleted file mode 100644
index 11e1d78b9f..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.3-shlib-aix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- Makefile.in.orig 2008-03-27 14:19:45 +0100
-+++ Makefile.in 2008-03-27 14:23:22 +0100
-@@ -51,6 +51,8 @@
-
- PIC_OBJS = $(OBJS:%.o=%.lo)
-
-+LIB_OBJS = $(OBJS)
-+
- OBJA =
- # to use the asm code: make OBJA=match.o
-
-@@ -69,8 +71,8 @@
- echo ' *** zlib test FAILED ***'; \
- fi
-
--libz.a: $(OBJS) $(OBJA)
-- $(AR) rc $@ $(OBJS) $(OBJA)
-+libz.a: $(LIB_OBJS) $(OBJA)
-+ $(AR) rc $@ $(LIB_OBJS) $(OBJA)
- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
- match.o: match.S
-@@ -82,6 +84,7 @@
- %.lo: %.c
- $(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@
-
-+$(SHAREDLIBM): $(SHAREDLIBV)
- $(SHAREDLIBV): $(PIC_OBJS)
- $(LDSHARED) -o $@ $(PIC_OBJS) -lc $(LDFLAGS)
- rm -f $(SHAREDLIB) $(SHAREDLIBM)
---- configure.orig 2008-03-27 14:19:49 +0100
-+++ configure 2008-03-27 14:25:29 +0100
-@@ -97,6 +97,11 @@
- shared_ext='.sl'
- SHAREDLIB='libz.sl';;
- esac;;
-+ AIX)
-+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-G"}
-+ LIB_OBJS='$(SHAREDLIBM)'
-+ buildSHAREDLIB=
-+ ;;
- Darwin*) shared_ext='.dylib'
- SHAREDLIB=libz$shared_ext
- SHAREDLIBV=libz.$VER$shared_ext
-@@ -172,6 +177,7 @@
- SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
- SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
- SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
-+LIB_OBJS=${LIB_OBJS-'$(OBJS)'}
-
- if test $shared -eq 1; then
- echo Checking for shared library support...
-@@ -179,7 +185,7 @@
- if ($CC -c $SFLAGS $test.c) 2>/dev/null &&
- ($LDSHARED -o $test$shared_ext $test.o) 2>/dev/null; then
- CFLAGS="$SFLAGS"
-- LIBS="$LIBS $SHAREDLIBV"
-+ LIBS="$LIBS ${buildSHAREDLIB-${SHAREDLIBV}}"
- echo Building shared library $SHAREDLIBV with $CC.
- elif test -z "$old_cc" -a -z "$old_cflags"; then
- echo No shared library support.
-@@ -463,6 +469,7 @@
- /^CPP *=/s#=.*#=$CPP#
- /^LDSHARED *=/s#=.*#=$LDSHARED#
- /^LIBS *=/s#=.*#=$LIBS#
-+/^LIB_OBJS *=/s#=.*#=$LIB_OBJS#
- /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
- /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
- /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
diff --git a/sys-libs/zlib/files/zlib-1.2.3-visibility-support.patch b/sys-libs/zlib/files/zlib-1.2.3-visibility-support.patch
deleted file mode 100644
index ceb065e9c7..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.3-visibility-support.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Only export symbols that should be exported.
-
-Patch by Mike Frysinger
-
-http://bugs.gentoo.org/32764
-http://bugs.gentoo.org/149929
-
---- zlib-1.2.3/configure
-+++ zlib-1.2.3/configure
-@@ -209,6 +209,20 @@
- fi
-
- cat > $test.c <<EOF
-+int foo __attribute__ ((visibility ("hidden")));
-+int main()
-+{
-+ return 0;
-+}
-+EOF
-+if ($CC -c -fvisibility=hidden $CFLAGS $test.c) 2>/dev/null; then
-+ CFLAGS="$CFLAGS -DHAS_attribute_visibility -fvisibility=hidden"
-+ echo "Checking for attribute(visibility) support... Yes."
-+else
-+ echo "Checking for attribute(visibility) support... No."
-+fi
-+
-+cat > $test.c <<EOF
- #include <stdio.h>
- #include <stdarg.h>
- #include "zconf.h"
---- zlib-1.2.3/zconf.in.h
-+++ zlib-1.2.3/zconf.in.h
-@@ -244,7 +244,11 @@
- #endif
-
- #ifndef ZEXTERN
--# define ZEXTERN extern
-+# if defined(ZLIB_INTERNAL) && defined(HAS_attribute_visibility)
-+# define ZEXTERN extern __attribute__ ((visibility("default")))
-+# else
-+# define ZEXTERN extern
-+# endif
- #endif
- #ifndef ZEXPORT
- # define ZEXPORT
diff --git a/sys-libs/zlib/files/zlib-1.2.4-build.patch b/sys-libs/zlib/files/zlib-1.2.4-build.patch
deleted file mode 100644
index 52b398cef0..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.4-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- zlib-1.2.4/win32/Makefile.gcc
-+++ zlib-1.2.4/win32/Makefile.gcc
-@@ -30,21 +30,23 @@
- #LOC = -DASMV
- #LOC = -DDEBUG -g
-
--CC = gcc
--CFLAGS = $(LOC) -O3 -Wall
-+CC ?= gcc
-+CFLAGS ?= $(LOC) -O3 -Wall
-
--AS = $(CC)
--ASFLAGS = $(LOC) -Wall
-+AS ?= $(CC)
-+ASFLAGS ?= $(LOC) -Wall
-
- LD = $(CC)
--LDFLAGS = $(LOC) -s
-+LDFLAGS ?= $(LOC)
-
--AR = ar
-+AR ?= ar
- ARFLAGS = rcs
-
--RC = windres
-+RC ?= windres
- RCFLAGS = --define GCC_WINDRES
-
-+DLLWRAP ?= dllwrap
-+
--STRIP = strip
-+STRIP = #
-
- CP = cp -fp
diff --git a/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch b/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch
deleted file mode 100644
index 26a20da523..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugs.gentoo.org/310225
-
---- configure
-+++ configure
-@@ -43,11 +43,11 @@
- echo ' configure [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]'
- echo ' [--static] [--64] [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
- exit 0 ;;
-- -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
-- -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
-- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;;
-- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;;
-- -u*=* | --uname=*) uname=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;;
-+ -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
-+ -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
-+ -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
-+ -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
-+ -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
- -p* | --prefix) prefix="$2"; shift; shift ;;
- -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
- -l* | --libdir) libdir="$2"; shift; shift ;;
diff --git a/sys-libs/zlib/files/zlib-1.2.4-minizip-autotools.patch b/sys-libs/zlib/files/zlib-1.2.4-minizip-autotools.patch
deleted file mode 100644
index 81a62f0b1d..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.4-minizip-autotools.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-sniped & improved from Fedora
-
---- zlib-1.2.4/contrib/minizip/configure.ac
-+++ zlib-1.2.4/contrib/minizip/configure.ac
-@@ -0,0 +1,12 @@
-+# -*- Autoconf -*-
-+# Process this file with autoconf to produce a configure script.
-+
-+AC_INIT([minizip], [@ZLIB_VER@], [bugzilla.redhat.com])
-+AC_CONFIG_SRCDIR([minigzip.c])
-+AM_INIT_AUTOMAKE([foreign])
-+LT_INIT
-+
-+AC_SUBST([HAVE_UNISTD_H], [0])
-+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
-+AC_CONFIG_FILES([Makefile minizip.pc])
-+AC_OUTPUT
---- zlib-1.2.4/contrib/minizip/Makefile.am
-+++ zlib-1.2.4/contrib/minizip/Makefile.am
-@@ -0,0 +1,28 @@
-+lib_LTLIBRARIES = libminizip.la
-+
-+libminizip_la_SOURCES = \
-+ ioapi.c \
-+ mztools.c \
-+ unzip.c \
-+ zip.c
-+
-+libminizip_la_CFLAGS = -I../.. -L../..
-+libminizip_la_LDFLAGS = -version-info 1:0:0 -lz
-+
-+minizip_includedir = $(includedir)/minizip
-+minizip_include_HEADERS = \
-+ crypt.h \
-+ ioapi.h \
-+ mztools.h \
-+ unzip.h \
-+ zip.h
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = minizip.pc
-+
-+EXTRA_PROGRAMS = miniunzip minizip
-+
-+miniunzip_SOURCES = miniunz.c
-+miniunzip_LDADD = libminizip.la
-+
-+minizip_SOURCES = minizip.c
-+minizip_LDADD = libminizip.la
---- zlib-1.2.4/contrib/minizip/minizip.pc.in
-+++ zlib-1.2.4/contrib/minizip/minizip.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@/minizip
-+
-+Name: minizip
-+Description: Minizip zip file manipulation library
-+Requires:
-+Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -lminizip
-+Libs.private: -lz
-+Cflags: -I${includedir}
diff --git a/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch b/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch
deleted file mode 100644
index 78c902abde..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Only export symbols that should be exported.
-
-Patch by Mike Frysinger
-
-http://bugs.gentoo.org/32764
-http://bugs.gentoo.org/149929
-
---- zlib-1.2.4/configure
-+++ zlib-1.2.4/configure
-@@ -209,6 +209,20 @@
- fi
-
- cat > $test.c <<EOF
-+int foo __attribute__ ((visibility ("hidden")));
-+int main()
-+{
-+ return 0;
-+}
-+EOF
-+if ($CC -c -fvisibility=hidden $CFLAGS $test.c) 2>/dev/null; then
-+ CFLAGS="$CFLAGS -DHAS_attribute_visibility -fvisibility=hidden"
-+ echo "Checking for attribute(visibility) support... Yes."
-+else
-+ echo "Checking for attribute(visibility) support... No."
-+fi
-+
-+cat > $test.c <<EOF
- #include <stdio.h>
- #include <stdarg.h>
- #include "zconf.h"
---- zlib-1.2.4/zconf.h.in
-+++ zlib-1.2.4/zconf.h.in
-@@ -244,7 +244,11 @@
- #endif
-
- #ifndef ZEXTERN
--# define ZEXTERN extern
-+# if defined(ZLIB_INTERNAL) && defined(HAS_attribute_visibility)
-+# define ZEXTERN extern __attribute__ ((visibility("default")))
-+# else
-+# define ZEXTERN extern
-+# endif
- #endif
- #ifndef ZEXPORT
- # define ZEXPORT
diff --git a/sys-libs/zlib/files/zlib-1.2.5-aix-soname.patch b/sys-libs/zlib/files/zlib-1.2.5-aix-soname.patch
deleted file mode 100644
index 2c638663e3..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.5-aix-soname.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-With a little help from my friend, the native-cctools wrapping ld to support
-'-soname' flag on AIX, we can provide full soname support there (#213277).
-However, this patch is not for upstream, as they cannot rely on that ld wrapper:
-They would have to do the aix-soname magic themself instead.
-
---- configure.orig 2011-02-03 16:47:00.000000000 +0100
-+++ configure 2011-02-03 16:47:51.000000000 +0100
-@@ -118,6 +118,7 @@
- fi
- case "$uname" in
- Linux* | linux* | GNU | GNU/* | *BSD | DragonFly | freebsd* ) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
-+ AIX* | aix* ) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"} ;;
- CYGWIN* | Cygwin* | cygwin* | OS/2*)
- EXE='.exe' ;;
- MINGW*|mingw*)
diff --git a/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch b/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
deleted file mode 100644
index 9b1f833102..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-accept freebsd targets
-
-http://bugs.gentoo.org/316841
-
---- zlib-1.2.5/configure
-+++ zlib-1.2.5/configure
-@@ -118,7 +118,7 @@
- uname=`(uname -s || echo unknown) 2>/dev/null`
- fi
- case "$uname" in
-- Linux* | linux* | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
-+ Linux* | linux* | GNU | GNU/* | *BSD | DragonFly | freebsd* ) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
- CYGWIN* | Cygwin* | cygwin* | OS/2*)
- EXE='.exe' ;;
- MINGW*|mingw*)
diff --git a/sys-libs/zlib/files/zlib-1.2.5-ldflags.patch b/sys-libs/zlib/files/zlib-1.2.5-ldflags.patch
deleted file mode 100644
index dff534b457..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.5-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/319661
-
-LDFLAGS is only used with the shared lib, so dont link against the static zlib
-
---- a/configure
-+++ b/configure
-@@ -19,7 +19,6 @@
- fi
-
- STATICLIB=libz.a
--LDFLAGS="${LDFLAGS} -L. ${STATICLIB}"
- VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
- VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
- VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
-@@ -174,7 +173,6 @@
- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
- OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
- CFLAGS=${CFLAGS-"-O -std1"}
-- LDFLAGS="${LDFLAGS} -Wl,-rpath,."
- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
- OSF1*) SFLAGS=${CFLAGS-"-O -std1"}
- CFLAGS=${CFLAGS-"-O -std1"}
diff --git a/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch b/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch
deleted file mode 100644
index 8d73430840..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.5-lfs-decls.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/316377
-
-try to unbreak over-eager LFS logic in zlib header
-
---- zlib-1.2.5/zlib.h
-+++ zlib-1.2.5/zlib.h
-@@ -1578,7 +1578,7 @@
- # define gzoffset gzoffset64
- # define adler32_combine adler32_combine64
- # define crc32_combine crc32_combine64
--# ifdef _LARGEFILE64_SOURCE
-+# ifndef _LARGEFILE64_SOURCE
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
- ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
- ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
diff --git a/sys-libs/zlib/files/zlib-1.2.5-static.patch b/sys-libs/zlib/files/zlib-1.2.5-static.patch
deleted file mode 100644
index f9520059e6..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.5-static.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=316815
-
---- Makefile.in.old 2010-04-22 17:37:16.000000000 +0000
-+++ Makefile.in 2010-04-22 17:36:17.000000000 +0000
-@@ -168,10 +168,10 @@
- -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
- -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
- cp $(STATICLIB) $(DESTDIR)$(libdir)
-- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
- cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
- -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
- -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
-+ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
- chmod 755 $(SHAREDLIBV); \
- rm -f $(SHAREDLIB) $(SHAREDLIBM); \
- ln -s $(SHAREDLIBV) $(SHAREDLIB); \
diff --git a/sys-libs/zlib/files/zlib-1.2.5.1-aix-soname.patch b/sys-libs/zlib/files/zlib-1.2.5.1-aix-soname.patch
deleted file mode 100644
index 15b8953402..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.5.1-aix-soname.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-With a little help from my friend, the native-cctools wrapping ld to
-support '-soname' flag on AIX, we can provide full soname support there
-(#213277). However, this patch is not for upstream, as they cannot rely
-on that ld wrapper: They would have to do the aix-soname magic themself
-instead.
-
---- configure
-+++ configure
-@@ -125,6 +125,7 @@
- case "$uname" in
- Linux* | linux* | GNU | GNU/* | *BSD | *bsd* | DragonFly | solaris*)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
-+ AIX* | aix* ) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"} ;;
- CYGWIN* | Cygwin* | cygwin* | OS/2*)
- EXE='.exe' ;;
- MINGW* | mingw*)
diff --git a/sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch b/sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch
deleted file mode 100644
index e747b01135..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.5.1-symlinks.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e41d99c135935b849e1e639632937829ff2000d8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 11 Sep 2011 14:32:53 -0400
-Subject: [PATCH] use relative symlinks for shared libs
-
-The DESTDIR should not be encoded into symlinks as it is only a
-temporary path. Further, since we install the symlinks into the
-same dir as the files, let's use relative links so that they can
-always resolve.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile.in | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 861970d..299bd1d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -176,8 +176,8 @@ install-libs: $(LIBS)
- chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
- echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
- rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-- ln -s $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
-- ln -s $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-+ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
-+ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
- ($(LDCONFIG) || true) >/dev/null 2>&1; \
- fi
- cp zlib.3 $(DESTDIR)$(man3dir)
---
-1.7.6
-
diff --git a/sys-libs/zlib/files/zlib-1.2.5.1-version.patch b/sys-libs/zlib/files/zlib-1.2.5.1-version.patch
deleted file mode 100644
index afaa1f0505..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.5.1-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 70386acb30b690fc9fcfdac9e01c8ca29ff20ef5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edwin?= <edwintorok@gmail.com>
-Date: Sun, 11 Sep 2011 10:00:52 +0300
-Subject: [PATCH] fix ld error: unable to find version dependency `ZLIB_1.2.5'
-
----
- zlib.map | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/zlib.map b/zlib.map
-index 65bcf17..f65a125 100644
---- a/zlib.map
-+++ b/zlib.map
-@@ -69,4 +69,4 @@ ZLIB_1.2.3.5 {
-
- ZLIB_1.2.5.1 {
- deflatePending;
--} ZLIB_1.2.5;
-+} ZLIB_1.2.3.5;
---
-1.7.5.4
-
diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
new file mode 100644
index 0000000000..934d21d725
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="https://zlib.net/"
+SRC_URI="https://zlib.net/${P}.tar.gz
+ http://www.gzip.org/zlib/${P}.tar.gz
+ http://www.zlib.net/current/beta/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="minizip static-libs"
+
+DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
+RDEPEND="abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+ !<dev-libs/libxml2-2.7.7" #309623
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch
+
+ if use minizip ; then
+ cd contrib/minizip || die
+ eautoreconf
+ fi
+
+# epatch "${FILESDIR}"/${PN}-1.2.7-aix-soname.patch #213277
+
+ case ${CHOST} in
+ *-cygwin*)
+ # do not use _wopen, is a mingw symbol only
+ sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h
+ # do not export gzopen_w, is a mingw symbol only
+ sed -i -e '/gzopen_w/d' win32/zlib.def || die
+ # zlib1.dll is the mingw name, need cygz.dll
+ # cygz.dll is loaded by toolchain, put into subdir
+ sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
+ ;;
+ esac
+
+ case ${CHOST} in
+ *-mingw*|mingw*|*-cygwin*)
+ # uses preconfigured Makefile rather than configure script
+ multilib_copy_sources
+ ;;
+ esac
+}
+
+echoit() { echo "$@"; "$@"; }
+
+multilib_src_configure() {
+ case ${CHOST} in
+ *-mingw*|mingw*|*-cygwin*)
+ ;;
+ *) # not an autoconf script, so can't use econf
+ local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
+ echoit "${S}"/configure \
+ $(tc-is-static-only && echo "--static" || echo "--shared") \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ ${uname:+--uname=${uname}} \
+ || die
+ ;;
+ esac
+
+ if use minizip ; then
+ local minizipdir="contrib/minizip"
+ mkdir -p "${BUILD_DIR}/${minizipdir}" || die
+ cd ${minizipdir} || die
+ ECONF_SOURCE="${S}/${minizipdir}" \
+ econf $(use_enable static-libs static)
+ fi
+}
+
+multilib_src_compile() {
+ case ${CHOST} in
+ *-mingw*|mingw*|*-cygwin*)
+ emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
+ sed \
+ -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
+ -e 's|@exec_prefix@|${prefix}|g' \
+ -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
+ -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
+ -e 's|@includedir@|${prefix}/include|g' \
+ -e 's|@VERSION@|'${PV}'|g' \
+ zlib.pc.in > zlib.pc || die
+ ;;
+ *)
+ emake
+ ;;
+ esac
+ use minizip && emake -C contrib/minizip
+}
+
+sed_macros() {
+ # clean up namespace a little #383179
+ # we do it here so we only have to tweak 2 files
+ sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
+}
+
+multilib_src_install() {
+ case ${CHOST} in
+ *-mingw*|mingw*|*-cygwin*)
+ emake -f win32/Makefile.gcc install \
+ BINARY_PATH="${ED}/usr/bin" \
+ LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
+ INCLUDE_PATH="${ED}/usr/include" \
+ SHARED_MODE=1
+ # overwrites zlib.pc created from win32/Makefile.gcc #620136
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins zlib.pc
+ ;;
+
+ *)
+ emake install DESTDIR="${D}" LDCONFIG=:
+ gen_usr_ldscript -a z
+ ;;
+ esac
+ sed_macros "${ED}"/usr/include/*.h
+
+ if use minizip ; then
+ emake -C contrib/minizip install DESTDIR="${D}"
+ sed_macros "${ED}"/usr/include/minizip/*.h
+ fi
+
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
+}
+
+multilib_src_install_all() {
+ dodoc FAQ README ChangeLog doc/*.txt
+ use minizip && dodoc contrib/minizip/*.txt
+}