3 files changed, 122 insertions, 16 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 626984aded82..0463a6ec221c 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/zlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.120 2012/09/30 17:26:34 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.121 2013/05/04 03:52:43 vapier Exp $
+
+*zlib-1.2.8 (04 May 2013)
+
+  04 May 2013; Mike Frysinger <vapier@gentoo.org> +zlib-1.2.8.ebuild:
+  Version bump #468014 by Samuli Suominen.
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org> zlib-1.2.7.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #435754
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 967e13946616..ec170b2db257 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -21,6 +21,7 @@ DIST zlib-1.2.5.1.tar.gz 548499 SHA256 c1f24a64f808528293cf04ba09a2dffbc3dd65ad7
 DIST zlib-1.2.5.tar.bz2 486374 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307 SHA512 88e8aa4bd2f23233cc6c0f52e568c7d8d2c18a69170c2363b574fbe5c86ce352d0768178c3fde6372576c45e0fdf80537ebde773689e3ad8584baddb889d0ede WHIRLPOOL d660761c4f437dd6c20e5cd23e442672c77264e6dc639bbf749d253c2fffd6b9fd32a9a9df7f5e9c3ec791afebbf486b8a4d6e8bac35cd2d2371dba759bb83a7
 DIST zlib-1.2.6.tar.gz 557220 SHA256 21235e08552e6feba09ea5e8d750805b3391c62fb81c71a235c0044dc7a8a61b SHA512 f812ab3049fc2920a8da4649f6e60340ac365d58a0e76ace5219426aeb0759c0a474cfb2b9902cd0471158fa32a4d2c35692309d266e66013444bdced8ed00d9 WHIRLPOOL 9655627d9770b6850d33b18ef7dc349396454fc217b90d3f7c2ffdac028533ff741c3a70ee4280ef91baf67425d037e6559dcea1da4c568ca51df8e9b7ab6df3
 DIST zlib-1.2.7.tar.gz 560351 SHA256 fa9c9c8638efb8cb8ef5e4dd5453e455751e1c530b1595eed466e1be9b7e26c5 SHA512 b1c073ad26684e354f7c522c14655840592e03872bc0a94690f89cae2ff88f146fce1dad252ff27a889dac4a32ff9f8ab63ba940671f9da89e9ba3e19f1bf58d WHIRLPOOL 2f0bc05a9c14033adc33cdd14d1dce72a57c650304692141a89af26274b62ffa67d09afbc68562d07279f80e214e396b357f20094ecf4b9576bc200cafa01a6d
+DIST zlib-1.2.8.tar.gz 571091 SHA256 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d SHA512 ece209d4c7ec0cb58ede791444dc754e0d10811cbbdebe3df61c0fd9f9f9867c1c3ccd5f1827f847c005e24eef34fb5bf87b5d3f894d75da04f1797538290e4a WHIRLPOOL bcb6243f1a9370eafcea03c227938da1cc106c934193ce59ef4fbdca0167777b95c9baa376feb6d8d369023024a74de5df17c2b6ec5887cdb732ffc95808ef95
 EBUILD zlib-1.2.3-r1.ebuild 2119 SHA256 29ce018a4109188b1fbf5617282f5f002b73ddc7d4e835a324ebfe5db070a200 SHA512 585493a84004b9481a195b554a47aaf5b2030ea772866ea325f8a8028b9c6ce3cf5146a504081be978a65d5044c9efd0c57dd8c2b277e6fa995b91bf1d5bde8e WHIRLPOOL 6ce69b357f8c0c7092aa91dbe17998cd60abbe781cdde244db99d805741ac5a1a63c8c7ea61934ded39953a8d4b84cc981e522e4a0f86fba81577d3a1658b6a4
 EBUILD zlib-1.2.5-r2.ebuild 1990 SHA256 75e0db1dc2ac78f6e629f5cda4635028fe5e33e7e6e4f1db8a68b9bcb49acbe9 SHA512 c979c655c809e5257c32e1d173bffc097a7f1617afa8f5784e2c28c6c0fa8a96bd700ae0032a8d6e3c236a9cd7e543ba183d3b5c33a151a0477a5d81a3ec12de WHIRLPOOL 1cf6c96b11ad30f38c94a9a4128534e8d913c217894aad430c1c121190b804e3725ef65f5c41df8a777ba64c64f3bc659d9ca7bd96e577f373af0b5bd89f58a5
 EBUILD zlib-1.2.5.1-r1.ebuild 2129 SHA256 160412b0a5e50f827077a6396a8834b1225670b893d8f937e049e88880c96966 SHA512 7dffeb5b73d5a4281a7c4982d1ce2086e02cc17a957228f4cb26d37dc5b6a39377ecc6ca654956c02e00c7b741cdb2b9bbf2bb071e790a93f2b567f6e9925d4d WHIRLPOOL f557df9d9b49faa8ee23ea81beb047b7a27c4d7f694fe733c1344b16d3430361a0dd38c1f59252447040aef2084024ca4c8658a08a0918fe9b570ae2699cca63
@@ -28,22 +29,23 @@ 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
-MISC ChangeLog 16709 SHA256 3d717afa73dd4325f5bf8c932c42ed1cc390cc88b290bb433f4461b761b0d26c SHA512 4dfcc6286783277e196ac6373efab79d3ae49c91252f7092c56a13cc52bbc52f66fa24b8fc48d53317af48c22e39d07e3ef84ba590b16c1941108b0280fc45a6 WHIRLPOOL e64ee3a7e25792303ec1562ef857754c341ad4ad809620d0b88ed319ea8e28b4b77706339a72f6740fae76876296924b7af7bbdaa81306eadb8c6ec57bb10c72
+EBUILD zlib-1.2.8.ebuild 2532 SHA256 6844aa5816a1c932381954453c732d57f42ac381e7368a3fd5427b7e1b9781ee SHA512 c2b2b48f0828f2a7f6d89f20cf32331af5dc0c580cce7df9b7891f845bd8661344569b541c0d75b666efcc52084c166e4e5261632eceac8e6e34e214f714d955 WHIRLPOOL a3c556a492efb984c25586ad9ad95356d5c21d59efde7c590fbc098e020df614f7f21c88edcb52df7242b83ea0892936942a694c5fe6910fc254494c24f89587
+MISC ChangeLog 16849 SHA256 4e8c4721a32b985400e1a4bb0c19226bd9b8a661f2974087a72a1e8e506c0eb8 SHA512 3569adc9a435fc5d7cb24024386f074c4766597919a4a60f44930ce613b5a5b43e0dbeb66b215208852e01fbd6703c4e37fdeefdaaebe6f0fdb90bbefef8ad78 WHIRLPOOL c73c242c46aaea25c2c32ae2aa6f00a4fe13e9b0bdd7a86cafc35bb3ab8b6ea861d0ec6a2ace3d92871e91e7a459bc01395a41b7072c38514cb9a21adb29ae8a
 MISC metadata.xml 273 SHA256 bb3ecfbae6d5e5ed47a494e99378545b9e66a0bdbced6f1d5120155f9e068a5d SHA512 85f1ea1bbbab6fa8a5250fa44faac577ed11a8dd910a7e3cd3a6ce030dd672d8a7f04a0bdf96a4f3ed18d94b77539ec6f93df35d5fdd26a2ee2976558f2663b8 WHIRLPOOL 6cc771cc416419b1a589412eee34e1864aaed3e750ee14493783c1f723165f1929ce0cfff125ac41bde2dfb6eee131979785979dd3660ba515b803621e358e39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRMxXFAAoJELEHsLL7fEFWXXEQAIYD9FNG1elo4JT9BPQBpjW7
-BfMKYaHcESJ1CqCNwBhnIJsbZZGS7PW5wHwtdSsHTzlhPifTblADbPKSmGG1krz6
-gxwezz52eFJyr633vs8WtPWAC3A2iy+bKVfXjP/mYyspsgNYVy741BVXpXOJxye4
-5LEe5lF0ykkqdHo/UtjxmsHnnsGYphL0V2IsEPrkxlnBgI3SdGOVXPXyaYVdbGa7
-yJYby+R5rS9PkUhDjQI7KYs3TXZgTX2rzShsJkWLXAt6rBnFN43tC3kvmK/qIQtI
-4WsLJCtR91fDhlEV6/pYq2CA1weDuuA5+/Ug/k7o+Nr2XyYGqQQmmqnSbo3on+O8
-TWNGKVyM6nm/cvCw4aASMZZpi90D6dW7wHJnNiNm7lxYDSIaStSdDDJOp6kFld6B
-7AcGqgoyoAU/mU1Vk3z8UHPCgBkF7K3u8omfQbQl7WSs6CLDfjj24bqgkZn3Vkae
-738IMeHAoUfItuQ9lIvVfZp0fSDNxYdHyggmDsnQNnEItbhQQBPhVQLoYRA+neUT
-4LyDV5b7TlmyQ5Y9O0oNHpMbVBeoMobmf/71owCe6qRmTrEyea3RK+0Sl3wiKFM1
-yAGSEmemA/NBi390vrNxgp3LlCysNe7VTdRdRZ8Yy1b5MSDloiLKw16xyNNC4agR
-k2VrzvgnUF5hJFLFwB1a
-=ZKFL
+iQIcBAEBCAAGBQJRhIYTAAoJELEHsLL7fEFW2dAQAJj+x339Haw5xvf5+cSi6VO+
+CbKJ3/NCi+kgALAJdlkcWikrsMuW+EmodEuK6U7dOufph7K51hpUZfLqxhwFjxE8
+LNp7KF8SHcNZg+SdwKwWatHFee983RNsxKOIXkhPXCZvejzkUnCK7gMrNbAfsEf8
+rPeCHKH/GP504uhqoKf2ADjzYP9utCx2Y1hJxFi0pV4QYJ5gNznMFmxeOqVM94Hx
+qbbdjMUOK1eMF0iT+N4YTz3Qac9NAuMVAmjY49GqlkTLebJKU2fEv4tc1qkpM+gg
+SeZXEJmNRaV89YgiS/Q54UdUABWMdMTHcy9V32TAdtlFDJiQo4e5igXO+ANVPxcs
+KCVwMNr2LAkYPSiAKXqd8zH2uXG8DzbWKj4o7U2WOE1JKJwXTPB2Cm5RI0YHU58W
+eE6Bq7NfzDLqXud54rOpZaoq0C3Yz/Im2GTktu1wv3yvqkp9Udg1Den591rrL2gu
+YO620+W2ka2v+7JuiQv89FXApf7nnQe8jsBIflVNvyUPRlHDY/twYB8WDxUJaBlp
+lvtSi50RgmIMZVV7NZLwj3RsDte8E1/C0fLAkRYIezBc9m0OL81DKzE/RI1zhOBH
+ijoOhzOHqCobVCxi5p9yfUkOddrVTLCDKevpxlUA4TTWAXwYNueJ+8/LvhiBZcwY
+55pnsvSQwm/EbagFBqfK
+=6DCE
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.8.ebuild b/sys-libs/zlib/zlib-1.2.8.ebuild
new file mode 100644
index 000000000000..8614c90aed6d
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.8.ebuild
@@ -0,0 +1,99 @@
+# 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.ebuild,v 1.1 2013/05/04 03:52:43 vapier Exp $
+
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit autotools toolchain-funcs multilib
+
+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="!<dev-libs/libxml2-2.7.7" #309623
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use minizip ; then
+		cd contrib/minizip
+		eautoreconf
+	fi
+}
+
+echoit() { echo "$@"; "$@"; }
+src_compile() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- || die
+		sed \
+			-e 's|@prefix@|/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 || die
+		;;
+	*)	# not an autoconf script, so can't use econf
+		local uname=$(/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
+		echoit ./configure \
+			--shared \
+			--prefix=/usr \
+			--libdir=/usr/$(get_libdir) \
+			${uname:+--uname=${uname}} \
+			|| die
+		;;
+	esac
+	if use minizip ; then
+		cd contrib/minizip
+		econf $(use_enable static-libs static)
+		emake || die
+	fi
+}
+
+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
+}
+src_install() {
+	case ${CHOST} in
+	*-mingw*|mingw*)
+		emake -f win32/Makefile.gcc install \
+			BINARY_PATH="${D}/usr/bin" \
+			LIBRARY_PATH="${D}/usr/$(get_libdir)" \
+			INCLUDE_PATH="${D}/usr/include" \
+			SHARED_MODE=1 \
+			|| die
+		insinto /usr/share/pkgconfig
+		doins zlib.pc || die
+		;;
+
+	*)
+		emake install DESTDIR="${D}" LDCONFIG=: || die
+		gen_usr_ldscript -a z
+		;;
+	esac
+	sed_macros "${D}"/usr/include/*.h
+
+	dodoc FAQ README ChangeLog doc/*.txt
+
+	if use minizip ; then
+		cd contrib/minizip
+		emake install DESTDIR="${D}" || die
+		sed_macros "${D}"/usr/include/minizip/*.h
+		dodoc *.txt
+	fi
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} #419645
+}