commit: cc23241959a2a4269f9dcf9f866488ea68d51593 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Mar 18 00:03:31 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Mar 22 08:57:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc232419
sys-libs/zlib: add blocker on sys-libs/zlib-ng[compat] sys-libs/zlib-ng[compat] provides libz. Also: * Update metadata indentation * Add github upstream metadata Signed-off-by: Sam James <sam <AT> gentoo.org> Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-libs/zlib/metadata.xml | 21 ++--- sys-libs/zlib/zlib-1.2.11-r4.ebuild | 160 ++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 10 deletions(-) diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml index 105b205e9e4..a45bfbc4ee9 100644 --- a/sys-libs/zlib/metadata.xml +++ b/sys-libs/zlib/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"> - <email>[email protected]</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> + <maintainer type="project"> + <email>[email protected]</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="github">madler/zlib</remote-id> + <remote-id type="cpe">cpe:/a:gnu:zlib</remote-id> + </upstream> </pkgmetadata> diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild new file mode 100644 index 00000000000..8a3b7742a6f --- /dev/null +++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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 -> ${PN}-1.2.11-cygwin-gzopen_w.patch" + "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="minizip static-libs" + +BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" +# See #309623 for libxml2 +RDEPEND=" + !<dev-libs/libxml2-2.7.7 + !sys-libs/zlib-ng[compat] +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch + "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch #658536 +) + +src_prepare() { + default + + if use elibc_Cygwin ; then + local p + for p in "${CYGWINPATCHES[@]}" ; do + # Strip out the "... -> " from the array + eapply -p2 "${DISTDIR}/${p#*> }" + done + fi + + 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 || 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*) + ;; + *) + local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167 + local myconf=( + --shared + --prefix="${EPREFIX}/usr" + --libdir="${EPREFIX}/usr/$(get_libdir)" + ${uname:+--uname=${uname}} + ) + # not an autoconf script, so can't use econf + echoit "${S}"/configure "${myconf[@]}" || 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 + + if ! use static-libs ; then + rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} || die #419645 + fi +} + +multilib_src_install_all() { + dodoc FAQ README ChangeLog doc/*.txt + use minizip && dodoc contrib/minizip/*.txt +}
