[gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     d3ef8acabfcb307fd049968acf232dea3dc751fd
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 07:25:27 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 07:25:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3ef8aca

sys-libs/zlib: Bump to version 1.2.10 (bug #604404).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-libs/zlib/Manifest           |   1 +
 sys-libs/zlib/zlib-1.2.10.ebuild | 117 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 93516ff..15a8de4 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,2 +1,3 @@
+DIST zlib-1.2.10.tar.gz 607647 SHA256 8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017 SHA512 5fa71052a418a0f2b345fce28af9941bbd1c6ee276ce506ab3092157f15776ee41f96bb1799657227513b852913f96ac52dae8122a437f34b43933ee48d63ee0 WHIRLPOOL 9eba860cadb54110873d304ac8857d59454dd934878290191046d40ee044580582ed7316345a8dc97cd899396d156646623c6ac4a08127c291f532c589db30be
 DIST zlib-1.2.8.tar.gz 571091 SHA256 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d SHA512 ece209d4c7ec0cb58ede791444dc754e0d10811cbbdebe3df61c0fd9f9f9867c1c3ccd5f1827f847c005e24eef34fb5bf87b5d3f894d75da04f1797538290e4a WHIRLPOOL bcb6243f1a9370eafcea03c227938da1cc106c934193ce59ef4fbdca0167777b95c9baa376feb6d8d369023024a74de5df17c2b6ec5887cdb732ffc95808ef95
 DIST zlib-1.2.9.tar.gz 607350 SHA256 73ab302ef31ed1e74895d2af56f52f5853f26b0370f3ef21954347acec5eaa21 SHA512 e3cca1bdd4d3a8a28a755f8b377a8077885df1cd8884d914ac08a1a1eac53cc371895410504b2754702b87e1e30834be5f93dca187c53d32fa2e0d383d0d5d80 WHIRLPOOL 4a055506d9ccc1360b8f200b76819db5acf810af3195c8dfaa9635d92563348cbc205baba43f5c42d884bbd762c65f55fc324fe65b22ab06d71c748fbdaa6cd7

diff --git a/sys-libs/zlib/zlib-1.2.10.ebuild b/sys-libs/zlib/zlib-1.2.10.ebuild
new file mode 100644
index 00000000..1c8a498
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.10.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Standard (de)compression library"
+HOMEPAGE="http://www.zlib.net/"
+SRC_URI="http://zlib.net/${P}.tar.gz
+	http://www.gzip.org/zlib/${P}.tar.gz
+	http://www.zlib.net/current/beta/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+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() {
+	if use minizip ; then
+		cd contrib/minizip || die
+		eautoreconf
+	fi
+}
+
+echoit() { echo "$@"; "$@"; }
+
+multilib_src_configure() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		;;
+	*)      # 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 \
+			--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*)
+		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*)
+		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
+		insinto /usr/share/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
+}