[gentoo-commits] repo/proj/prefix:master commit in: sys-libs/zlib/files/, sys-libs/zlib/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     0191f0c6e66a42b6b02af337d385afa16b4f7e3b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 09:36:33 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 09:36:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0191f0c6

sys-libs/zlib: drop ~ppc-aix

Bug: https://bugs.gentoo.org/760057
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-libs/zlib/files/zlib-1.2.7-aix-soname.patch |  16 ---
 sys-libs/zlib/zlib-1.2.11-r1.ebuild             | 151 ------------------------
 sys-libs/zlib/zlib-1.2.11-r2.ebuild             |   2 +-
 3 files changed, 1 insertion(+), 168 deletions(-)

diff --git a/sys-libs/zlib/files/zlib-1.2.7-aix-soname.patch b/sys-libs/zlib/files/zlib-1.2.7-aix-soname.patch
deleted file mode 100644
index 5f03e6e534..0000000000
--- a/sys-libs/zlib/files/zlib-1.2.7-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/* | 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"} ;;
-   *BSD | *bsd* | DragonFly)
-         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
-         LDCONFIG="ldconfig -m" ;;

diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
deleted file mode 100644
index c96c3f226f..0000000000
--- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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
-
-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="~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
-
-	local p
-	use elibc_Cygwin &&
-	for p in "${CYGWINPATCHES[@]}"; do
-		epatch "${DISTDIR}/${p##*/}"
-	done
-
-	if use minizip ; then
-		pushd contrib/minizip >/dev/null || die
-		eautoreconf
-		popd >/dev/null || die
-	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
-		# 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
-}

diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
index 4bdcc47b50..fb506989ef 100644
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://zlib.net/${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"
+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} )"