Add ebuild supporting native multilib (#457134, thanks to mgorny and vapier for their help)

Package-Manager: portage-2.1.12.9/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 125 insertions, 15 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 33598f1f80af..24922478c193 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.123 2013/06/17 02:33:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.124 2013/06/23 07:43:53 pacho Exp $
+
+*zlib-1.2.8-r1 (23 Jun 2013)
+
+  23 Jun 2013; Pacho Ramos <pacho@gentoo.org> +zlib-1.2.8-r1.ebuild:
+  Add ebuild supporting native multilib (#457134, thanks to mgorny and vapier
+  for their help)
 
   17 Jun 2013; Mike Frysinger <vapier@gentoo.org> zlib-1.2.8.ebuild:
   Fix transposed emake #473370 by Michał Górny.
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 66a5efdb5c19..7e4d5eb0ee59 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -29,23 +29,14 @@ EBUILD zlib-1.2.5.1-r2.ebuild 2772 SHA256 7d976dd0132e208d8127d600fa6d6ce33cf419
 EBUILD zlib-1.2.5.1.ebuild 1978 SHA256 daf91a9db719d6db404df3423b5c16e30e15bde7cb639ba4f4bdd5f595348bfd SHA512 1d6e0a1baff507bd9690daf9bea1eddb5c94faaeb710501fe686822a6c1f1dbfe9aece9d6350fde38ac8711ae17ded17b544448a5d28724b2158a7c8426ba065 WHIRLPOOL 0317a2841967a3c42ec9d2c9fb29059ae6aab7dd13cbb2d042932845eee02a86ce02fdfab185618bd60624249ff3cdf6b9b435ae619a6166b31938949ed53644
 EBUILD zlib-1.2.6.ebuild 2384 SHA256 0a549e860c658f2eac688b4d956d101c10f85525626128a5bf9e826b9f220e49 SHA512 1310a3935d0fe11db4601ee61b3a14121e446036042b971e3a61305c68560f507d9dafa9799faaa9d5d6d4c7e4f8163df19fe6cb682e9feb13500f1e2cf22f21 WHIRLPOOL 0eb9c2e14fb33355cf717a93b8e25828524a3add9e8e068a6f47e2294e9ba9dac36a900387d851deebaaf22c820046eba83e255b380c65d33a5d603ae3f19df0
 EBUILD zlib-1.2.7.ebuild 2521 SHA256 1d47bd9bd6bd7c1ef09ec4183032289c98c95bfc14bb2bc0c28336c333e627ca SHA512 7c19f08ee61380da9e9115a133d68b63f3ddd18f60c7c73fcf9824139e0f57ff488606e73dc9abe7defc333b0fb54d20ec955c3234d8ebebdeecd90e3d1d6c4d WHIRLPOOL 1b37518ac0f9dd653c6d574b945e1224175e9ff5a873905f40b2a2a77d68d5a2b411d6262298d0b77bbe4c7f76521be3bbba8ca407d1b509bc846692f2b67bc7
+EBUILD zlib-1.2.8-r1.ebuild 2842 SHA256 2b1771e92fbff85f749d49c5074deb87b988d3715132732d82ed2ef26f9cb957 SHA512 145cdb9a36d9c9ee8d13e21942e8bdc1cad22545571b80ff7bbbca584b907dbd3d01f5ae7105bd723da72feffa958ead922edf84231dc6660f7f6bb516e352a2 WHIRLPOOL ef01ffba3c335b09c96fe301e1d71020e95bc3b1934d41aa6778c0bae74ee2470c514d973e2c073f5e0cded4f38d27c508871864a8b2d9ecbcc4fbf386186181
 EBUILD zlib-1.2.8.ebuild 2532 SHA256 103f8c24f7900e89f0e158b42449388c3b636a66867050bfb4f295448dcbb5bc SHA512 0e80382820823a7f150346f4d595ab2a5788e05f9e384dbc326d5dd53c7dd457fdb5491183735aa2dfa2aa64e0b6d21069f764f181d6b78beb708973ecd4037a WHIRLPOOL 2ed794a3b3051576f15e27c79baa8764936da8743ae6a8baa1c2847b05b81f49afd40fd858c5f9b250251aaf8e342d2be24f8d176371e1c89efdb9b60534081b
-MISC ChangeLog 17090 SHA256 986d08ce3eefc58a9b97b3f1a53c475a690f79aa7e0c084eee25dbc4e1a9904b SHA512 ec940a7dec632e48b5b7a311d05769272a833690fbcba47650aa424e6019891b5ef9ddaebe4dc2b618c450ed9e509795602c7ab2674e1cef51406b66b2d0e841 WHIRLPOOL 957548a6053025200f9e2f799b63c5aa6e1acf8520cdcf51aac30653f9c68da7f0b11d917f2676c618752afa6a14db4669457ef4647b5e3a92eeb13826e59868
+MISC ChangeLog 17285 SHA256 d4f2c4e9f93f349523844aafb091fc2cce084ba87cdac3d41d4eae7fbd5bc817 SHA512 b0fcbbd9007b0a49153aa75678a727b4497f60fd62796bee80520408012d895a2d85f23fc8d1ef2abd455fd3894af5c0df62029f34211b0663a07bff6a861677 WHIRLPOOL 3f72b022c4eefcd59c2e210bc6dbdd28e02bace89fbff471763ec818dbad590c926da2d5a32377565601cbe5e662a4554571df06d7ef27bc6954ad317fd6e228
 MISC metadata.xml 350 SHA256 4eb380d7bf14e79af8acffb3db2d71aeebf9f8859b60df89d068e455246aaae3 SHA512 4d9c036be5cfbb5ddb92df7dd64f41721baf96d1433429d3630f02454599278102d04d174d982c57fb84e6df00ebf6844ec562b24aaf3cb97538bf0b1eb9b4e2 WHIRLPOOL ea8c9d20dc5d46b0717994c8adf894c673bcaf898bbb532dd3c940c3de60e2a0cb7b26cb7c524c12b5befbb02a94bdf36669a87c2a06cce7bad6e0150ec787fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRvnVwAAoJELEHsLL7fEFW8sgP/2ngd5t4P9RnwkyDqTm0xeQT
-sgxiz6/SE0J0mkkqXqPfh3GQjVLOgvsZXVlPXaw9cEVlXGndDKJhYKQ1ihs9ggrk
-RQwul4jGq4yCfntes6WaSzwY9VFdKYxaHGal/s5c6YN+zBgwx0yfqWSfYw6oebPP
-GQmqak8D49b3/RxWrseKeoo+hNIrh74CG7AJG1ZmVMp5YfzMxq6GY2kyCdh9Mk/c
-79UsUSEgCXD1PjvaT0vMOeF/2FYjf38j465jtU1yaXmybtMm0g4+4c6CX9rVQw4v
-0eAF+FJbSHrJCA+6kVtPIW8HiSfxpgFH2gh6DTE5KETFvSqqtryk9JiOVa09T0aB
-28OJuUGJYVtRptNkBe+FPwJFgTTXRPrMMX/htPPLSmnHy7qu1yd397g/5+d3TpFC
-n0gvJ3jlOG3epQR9VMaYV9eM9lwcxh1dbj1k6MlTPj1mIZh9hrKVW4cVL/FFIoVQ
-c1gVya/nqV5vnu34+50bUI9M9s4qovQTpmLx1ekBlRYlGFkmXZzwkQtdg4OsLj8a
-g/kLiyzzRy8t4PTfIzhy8ED5LFlYEW3wAKihHEWgFqzLpnHqPFh5PJghXRBOvQ+3
-R+3msOTojZ59tlnYZra+QrLaxmJ7aZWBDz66hSdvwv++PkOocHMOfTHsNIO/tmYA
-4fQ9KFoIyyDzlXIaSa97
-=fXGK
+iEYEAREIAAYFAlHGpzoACgkQCaWpQKGI+9TEKQCggGmcyGqjz1iYvxy84bSwAN2T
+RqEAnR3/lfjE9mHwIhvnpPXr1I8UDCeY
+=6+B8
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.8-r1.ebuild b/sys-libs/zlib/zlib-1.2.8-r1.ebuild
new file mode 100644
index 000000000000..0c91f955dbb6
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.8-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v 1.1 2013/06/23 07:43:53 pacho Exp $
+
+EAPI=4
+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 ~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 )
+	!<dev-libs/libxml2-2.7.7" #309623
+
+src_prepare() {
+	if use minizip ; then
+		cd contrib/minizip || die
+		eautoreconf
+	fi
+
+	multilib_copy_sources
+}
+
+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 ./configure \
+			--shared \
+			--prefix="${EPREFIX}/usr" \
+			--libdir="${EPREFIX}/usr/$(get_libdir)" \
+			${uname:+--uname=${uname}} \
+			|| die
+		;;
+	esac
+
+	if use minizip ; then
+		cd contrib/minizip || die
+		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
+}