Version bump.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 117 insertions, 7 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 1343cc6bda6e..1867d635b9aa 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/zlib
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.97 2011/09/23 17:52:32 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.98 2012/01/30 06:47:57 vapier Exp $
+
+*zlib-1.2.6 (30 Jan 2012)
+
+  30 Jan 2012; Mike Frysinger <vapier@gentoo.org> +zlib-1.2.6.ebuild:
+  Version bump.
 
   23 Sep 2011; Justin Lecher <jlec@gentoo.org> zlib-1.2.5.1-r2.ebuild,
   metadata.xml:
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 2db4834434ad..4f82937d0b61 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX zlib-1.2.1-build-fPIC.patch 2211 RMD160 c0283f640411a8a2c64073ea1833642cafff6fc9 SHA1 496fc5ad5341d81239a4e7b9d203aecbbaac0114 SHA256 c02fce932ea57fc417a51f5f0676abdcecc890e67a3c3cda510c0c151e2be88b
 AUX zlib-1.2.1-configure.patch 3149 RMD160 45a6e8fd83be0488bdf59f8965d394fc3be84246 SHA1 9c9165bbf4a009fb1629601da262e0497050b0c2 SHA256 ca0d5f7e50a90e6cafa554c85a9b19a8e2cbbb8c8f1de47fdd257ebfac4595aa
@@ -19,17 +19,29 @@ AUX zlib-1.2.5.1-version.patch 538 RMD160 83894076a97f0db0d88880ca745819ce89a91a
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 DIST zlib-1.2.5.1.tar.gz 548499 RMD160 9f7d449167427c8add0b61a76a51bee164856592 SHA1 731b09322e18a3853e6b6b98b44175d7aed1e407 SHA256 c1f24a64f808528293cf04ba09a2dffbc3dd65ad7ebcee4737124ff8923756da
 DIST zlib-1.2.5.tar.bz2 486374 RMD160 c6c4c2a2a205061b21487e69234106f5517b4b32 SHA1 543fa9abff0442edca308772d6cef85557677e02 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307
+DIST zlib-1.2.6.tar.gz 557220 RMD160 71845aad5ad9a0e290fa13c7325f45fa3682c7cb SHA1 38690375d8d42398ce33b2df726e25cacf096496 SHA256 21235e08552e6feba09ea5e8d750805b3391c62fb81c71a235c0044dc7a8a61b
 EBUILD zlib-1.2.3-r1.ebuild 2108 RMD160 86035d0567fbd74c1e4f066a8650a235824527c1 SHA1 f329bb4098c9b4d526bed79ef2d3932d178004e7 SHA256 1826babce8086b210791956f9a698909e5aea6ad695d18a15d5fbb774e058552
 EBUILD zlib-1.2.5-r2.ebuild 1985 RMD160 51991cece3b068936d37ba832d51813536888d13 SHA1 785858d4dee04e3ac110f6bdfc29e2dc76276683 SHA256 0a99b2f2b02be7316b92390f0b7d2f3654b9e9e4cad2616f96a6c304ea3ac598
 EBUILD zlib-1.2.5.1-r1.ebuild 2120 RMD160 f8eb787ce206bafafae3cba50f4982b4beea60e4 SHA1 3cb35b8e30ea41fdf6029274862ace3922f3ff14 SHA256 d4211f602ec3fb4f7f18655af3a49b22bd7e247b551328f35fd599cb2223f56c
 EBUILD zlib-1.2.5.1-r2.ebuild 2772 RMD160 e8999ca568bce5ba6e9f82c3ce1ed12f22225940 SHA1 5fa9db66b7bccab60fcce1bb10d4abb59cab9c14 SHA256 7cc86f49839e1838a0b31079a0a806d7f65f22fa0b39f9e0169bf94254a9c233
 EBUILD zlib-1.2.5.1.ebuild 1969 RMD160 fd7596c2f8d93859ae68329622b93b3c2cb3eca6 SHA1 4fb8715b7b760e8e8bd8d7558f2c61791dc1bf38 SHA256 6e6f0643c77d90a425c288f1e6097bff27cb5bac8ce2070ec3c0526d69ef6280
-MISC ChangeLog 14049 RMD160 ead534969534ddbd56c9ab4a768c9ebded0aa163 SHA1 7783efabc747e219f85cefdc0bf2de8f5e11a3a2 SHA256 b574043f8c2d265ccc41801bdef6ef1aae8bbf62e47839cd299562f83b4a3ae1
+EBUILD zlib-1.2.6.ebuild 2364 RMD160 9ee94ceb7472b5602ceb9006ead0ef982d64fdaa SHA1 ebc2b4e2707689f439a5b0e50d42519e403327c4 SHA256 136100d3548e737564e5a46aa0243738afe403f6891a785ca5505b3461c14b37
+MISC ChangeLog 14165 RMD160 80ba1a39c34aad0c1c4bebf1b08ad0ca9c24cd28 SHA1 72ce9360b182a061aeb198ad9c78fb00ce1189e7 SHA256 3e4a4f28a528e7815c15a74e1dce38cae6ddc625cf712e94dfd01fe7270b80f5
 MISC metadata.xml 273 RMD160 8a4efa30c007f6bd676dd9b7caee92b096ba8b72 SHA1 89495834d604d9aba2d9a765cb7feeff44430978 SHA256 bb3ecfbae6d5e5ed47a494e99378545b9e66a0bdbced6f1d5120155f9e068a5d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk58x2sACgkQgAnW8HDreRZKlwCdHNrwFfZqHdhNuHYEx9rOXZh+
-VNsAn1KPPYZVucqWuYRu41pDKsnSJSLI
-=W1hb
+iQIcBAEBAgAGBQJPJj1wAAoJELEHsLL7fEFW5LgP/iuMI7f1O3qwtix1x0ffCZEY
+yY4PHqKfBWbuwJxBCoiT6y98e6R0tVac8/NsHqGaEr0QHC8zIVVl93biUKlp1JE8
+malQKsjDUq0wS07d2VAnbHFY+rWBQCJoGWJY5Z1vFxJ8CEbDdgeb1Eo5tDUIapO3
+g0QykDyvhpxtHS4NUHBBDP8JSq6paqnCxMjhIxgt5lO7JET8k7U2kV0U5xYujHuR
+eNhH0kc8Dw6wJzGBhigA6AzmjYXHiCehk45YuMb3WB4lkcGhk95Ub1fDmgiVbN1k
+/a5tCP6SRtulWe/Sgz0Zrd1DUuRmD8/qDL71U9MwIV2KxP8N245NkrKqoo0+TGcw
+wqYd1zdXegPIfb7jUXIOjoJH+PtgBMRn40D0DowDE6tZowpQEWCtymcaLMGlpqRQ
+rr8dPMdycPR+0dNyczXpYL7YM+eaI2hftrPMj27rHSd5z2rAE+1Cp01fh+ONFRlK
+l/SnUp622+Qi/8CPvjVT4Ap2Cu54/C3Or2K8cPdQBUyfTuJV4yh/9GA93+XXVLRn
+KaMwt1BrQTMDEFSMDu9YWYA9x0qYqtenUET7qCiGQFoICXEZ+jZJr4YH2jqJBdQf
+Xp0XOyv2Uqo6hSZr+DT36PONTazDTvxqYYhse3mA+FKG2yVR5a0TBfrhVxHP9yBm
+M/LLjMfO+vN60E/eUv54
+=xjqO
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.6.ebuild b/sys-libs/zlib/zlib-1.2.6.ebuild
new file mode 100644
index 000000000000..73859fadec28
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.6.ebuild,v 1.1 2012/01/30 06:47:57 vapier Exp $
+
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit autotools eutils toolchain-funcs
+
+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 ~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
+		;;
+	*)	# not an autoconf script, so can't use econf
+		echoit ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die
+		emake || 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
+		sed_macros "${D}"/usr/include/*.h
+		;;
+	esac
+
+	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)/*.{a,la}
+}