gentoo new year resync : 01.01.2021

2 files changed, 34 insertions, 8 deletions

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 4eb65f623272..8da0afa6070d 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,6 +1,8 @@
 AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 BLAKE2B 42fcb91b99b004921dce12b4e71c12c62e80d50243a1cec97522dbaa1cf5fb09cf701e9f988bddd0470c3dafe743d42e60b9ac6903afb2185859d62b1fdf78bc SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286
 AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb2ebf1154b890782d9952288627dd5093eeeaed9265a6041922e9fef378333ad3b9ac2333d692b06db1d6425df25d6062b9fc42ec8c50 SHA512 158c4b711e8afc248cbd55f2057dede18540ad35ec1a47d0cfb0fe9bf10b1507bb1b4525badcc0a8b6505062d838ee4fb2d4ebfbf9c9d1694336a704bc0b690e
+DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
+DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
 EBUILD zlib-1.2.11-r2.ebuild 3101 BLAKE2B 90e53e105aa8ac4c209c781db0dfb2173e1c51a70f52fd14cefa7e57fba3b2983e693c8b26261e9e05b448db20c677375b1845017fc7985f39a8e7d752deecbc SHA512 e5c4cdae891e4a9febcfcf9c826c79b288bef48599d1d065990077c0970d7a4d449b6a5d8fe19915396810ea45406a757b478e4845205a5a4c3dd1c9b3e7ac32
-EBUILD zlib-1.2.11-r3.ebuild 3179 BLAKE2B 1548f9b4788f13085f9ba1d8e74e0cd4e4da77c4403d624c6e3fdb75eb826e6e10f167fcbcb1d550bf218b3ca9b3fad412f31b54c88c8975f963c5ec2a596356 SHA512 f857e5bc442e310aa5b05b85760e92f52a5bdf8cc40e796b11eccd2de6af0ee6d1b208a6898cda5cf5e87070973b419539f9389d1618f012e7953b28ca539a53
+EBUILD zlib-1.2.11-r3.ebuild 4200 BLAKE2B 45269fa5c5df2d991b21f825aff4a2b22d8727b53deb4446a1f0cd97ecb7f74962e1fa682aae16d7c6e67b4ae0f5fd67c8c9bfc451175203d6d133762ca1c1e0 SHA512 17bc7f7650e38e1f8a7e30646c6645940ac14ab11bed7d57f80b37e43f9268e6326594c4920e86b835b20c6b8cc287fdd4b462b5ce11ef99cdad25698b1bb1e7
 MISC metadata.xml 432 BLAKE2B 80b2aa4dbc687fa23b3e64f12af789d2b1f308ccba611de152efde3008a5b6f66ee56121c2c4846a482e426c78e5f921ee7cf9b196c28504ee0de420725a6239 SHA512 947d4b2035ab49c42f6141f14553f1e8f4796b4ddc24c6a4f071ac2300eb120648dd03eef49773295d3e3f30cd9d3cbb391bde798dacf1187b46ff75abd59420
diff --git a/sys-libs/zlib/zlib-1.2.11-r3.ebuild b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
index b7ea3672a88c..050208082f01 100644
--- a/sys-libs/zlib/zlib-1.2.11-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
@@ -6,15 +6,21 @@ 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"
+	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"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="minizip static-libs"
 
 BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
@@ -29,13 +35,31 @@ PATCHES=(
 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
-	*-mingw*|mingw*)
+	*-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
 		;;
@@ -46,7 +70,7 @@ echoit() { echo "$@"; "$@"; }
 
 multilib_src_configure() {
 	case ${CHOST} in
-	*-mingw*|mingw*)
+	*-mingw*|mingw*|*-cygwin*)
 		;;
 	*)
 		local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
@@ -72,10 +96,10 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	case ${CHOST} in
-	*-mingw*|mingw*)
+	*-mingw*|mingw*|*-cygwin*)
 		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
 		sed \
-			-e 's|@prefix@|/usr|g' \
+			-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' \
@@ -98,7 +122,7 @@ sed_macros() {
 
 multilib_src_install() {
 	case ${CHOST} in
-	*-mingw*|mingw*)
+	*-mingw*|mingw*|*-cygwin*)
 		emake -f win32/Makefile.gcc install \
 			BINARY_PATH="${ED}/usr/bin" \
 			LIBRARY_PATH="${ED}/usr/$(get_libdir)" \