gentoo resync : 31.05.2021

3 files changed, 2 insertions, 159 deletions

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index fd026cfa8259..3bf83283fc78 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -3,6 +3,5 @@ AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb
 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-r3.ebuild 4156 BLAKE2B 068f32e1a9d540d3e7d21b882e58ccf96eec11f22ce2c45234e9ab5817da23fbc54c58e9a47e613199e5f6a6a7f0103e18edd3624ae4dc1d83d7c934835a620c SHA512 029f420cee843bbdbb3f1831e435f383f42fc5d2e563d9ca5e6f4fc47070f34ab4d7827f297c869a5fd0192e997e9c4577f0c0a993f99d7414c6b75b8a993a6e
-EBUILD zlib-1.2.11-r4.ebuild 4212 BLAKE2B 9f33d6e40ce2511f812f415187f07565fce8d3c64badb70a59e6b76089d1c0836a5db12b4ef42761df758caf30a6083cc1ff5737346115634d899c3eeffe50bf SHA512 c79411f1bfb99196aba66d060968c51f0565fe9f8b3969fede6e7aa3721bd534badbbb7de523ad32dcaccd64e030fab7a182de0dee65a6bd15282a5705b97f35
+EBUILD zlib-1.2.11-r4.ebuild 4204 BLAKE2B ec6dbf321e9cfcfd555387469f0513b3ce13fef99b0a3710beff97621edd61568da20656eb8f8fee0b152d2928d60bca32e63fff090dbf492e237b6470a8e9b0 SHA512 53969ab5f1d09798445176e103abc9b1d58f72072caed38adf09db94cd692b9841cd39f4c19400d1873e07dc024cc6a5aa7e220ecc0e831bcd148857607cd383
 MISC metadata.xml 493 BLAKE2B 56454cd42e326bbf6d5b6c535cfcf49edeaadf748d7b7c2956dbabebf32a1372800c3bc5442b28ef1f153c846475f77f24ee0256f34f038d5903166e0cd4612d SHA512 fbf724610d52699ef2cbc59870fb09e786df2dc36f4c89955d12460a11070a153dc2bda31f4c9d207dba08638eaa965d359b20fce90d401528cb67f3947e3a60
diff --git a/sys-libs/zlib/zlib-1.2.11-r3.ebuild b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
deleted file mode 100644
index cd37e9b956af..000000000000
--- a/sys-libs/zlib/zlib-1.2.11-r3.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AUTOTOOLS_AUTO_DEPEND="no"
-inherit autotools 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} )"
-RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
-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
-}
diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
index 2a1bea3fe2ce..5dfe56381a95 100644
--- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
 
 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"
+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} )"