commit: e89817d6af04da266c5de33f536d24843b2ac241
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 20:15:06 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 20:15:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e89817d6
sys-libs/zlib: moved to ::gentoo
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/zlib/Manifest | 3 -
.../zlib-1.2.11-fix-deflateParams-usage.patch | 67 ----------
.../zlib-1.2.11-minizip-drop-crypt-header.patch | 38 ------
sys-libs/zlib/metadata.xml | 14 --
sys-libs/zlib/zlib-1.2.11-r2.ebuild | 145 ---------------------
5 files changed, 267 deletions(-)
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
deleted file mode 100644
index 8c23d4e6e6..0000000000
--- a/sys-libs/zlib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST 1.2.11-gzopen_w.patch 1170 BLAKE2B
fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274
SHA512
14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
-DIST 1.2.7-minizip-cygwin.patch 2626 BLAKE2B
885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a
SHA512
e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
-DIST zlib-1.2.11.tar.gz 607698 BLAKE2B
6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7
SHA512
73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
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
deleted file mode 100644
index 18764849b9..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.11-fix-deflateParams-usage.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f9694097dd69354b03cb8af959094c7f260db0a1 Mon Sep 17 00:00:00 2001
-From: Mark Adler <mad...@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.11-minizip-drop-crypt-header.patch
b/sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch
deleted file mode 100644
index 2e0a93e919..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.11-minizip-drop-crypt-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/658536
-https://github.com/madler/zlib/pull/229
-
-From e490ddad3091574a0c2e3b5a66a8fee9a7ab212f Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <prais...@redhat.com>
-Date: Sun, 19 Feb 2017 16:42:12 +0100
-Subject: [PATCH] minizip: don't install crypt.h
-
-People did mistakenly or unintentionally include crypt.h before,
-don't install this internal header from now.
----
- contrib/minizip/Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am
-index d343011ebc3b..4f46610238d2 100644
---- a/contrib/minizip/Makefile.am
-+++ b/contrib/minizip/Makefile.am
-@@ -26,13 +26,15 @@ libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
-lz
-
- minizip_includedir = $(includedir)/minizip
- minizip_include_HEADERS = \
-- crypt.h \
- ioapi.h \
- mztools.h \
- unzip.h \
- zip.h \
- ${iowin32_h}
-
-+noinst_HEADERS = \
-+ crypt.h
-+
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = minizip.pc
-
---
-2.17.1
-
diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml
deleted file mode 100644
index 105b205e9e..0000000000
--- a/sys-libs/zlib/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>base-sys...@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-<use>
- <flag name="minizip">include the minizip library for quick and dirty
zip extraction</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:gnu:zlib</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
deleted file mode 100644
index fb506989ef..0000000000
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools toolchain-funcs multilib multilib-minimal usr-ldscript
-
-CYGWINPATCHES=(
-
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch";
-
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch";
-)
-
-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
- elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~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="!<dev-libs/libxml2-2.7.7" #309623
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch
- epatch "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
#658536
-
- local p
- use elibc_Cygwin &&
- for p in "${CYGWINPATCHES[@]}"; do
- epatch "${DISTDIR}/${p##*/}"
- done
-
- if use minizip ; then
- cd contrib/minizip || die
- eautoreconf
- fi
-
- case ${CHOST} in
- *-cygwin*)
- # do not use _wopen, is a mingw symbol only
- sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h
- # 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
-}
