Version bump #414453 by Samuli Suominen.

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

3 files changed, 116 insertions, 6 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index a86b6a0a8251..254a40e85cb9 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.100 2012/05/01 19:24:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.101 2012/05/03 16:12:52 vapier Exp $
+
+*zlib-1.2.7 (03 May 2012)
+
+  03 May 2012; Mike Frysinger <vapier@gentoo.org> +zlib-1.2.7.ebuild:
+  Version bump #414453 by Samuli Suominen.
 
   01 May 2012; Jeroen Roovers <jer@gentoo.org> zlib-1.2.5.1-r2.ebuild:
   Stable for HPPA (bug #384483).
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 9303cb462cb2..6ce557e9ac00 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -20,18 +20,30 @@ DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 S
 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
+DIST zlib-1.2.7.tar.gz 560351 RMD160 363ffcf75a2cff8e4e5f085d6a1132e696200499 SHA1 4aa358a95d1e5774603e6fa149c926a80df43559 SHA256 fa9c9c8638efb8cb8ef5e4dd5453e455751e1c530b1595eed466e1be9b7e26c5
 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 2770 RMD160 98266fa60da3af3bc2f92ea7c6bb6e4655e61b5b SHA1 4d00decdbe746cc9964941b61733ab7527e1656d SHA256 9b5d8d5844c81eabb39ea43fc4fb93650d5d0f7ee5b192439df3143fcc58fc0e
 EBUILD zlib-1.2.5.1.ebuild 1969 RMD160 fd7596c2f8d93859ae68329622b93b3c2cb3eca6 SHA1 4fb8715b7b760e8e8bd8d7558f2c61791dc1bf38 SHA256 6e6f0643c77d90a425c288f1e6097bff27cb5bac8ce2070ec3c0526d69ef6280
 EBUILD zlib-1.2.6.ebuild 2378 RMD160 96bbdd8a3a874737ac6a32af33de207287758b74 SHA1 fdeb25d5c038ac01c02266ca9d03eede78546cc4 SHA256 6a4cb810c7e811f7671effad2f57bcbe120b39c880be72ead4219ecc0cb793d0
-MISC ChangeLog 14362 RMD160 efa6ec88816f793a2e6bd69bc9021f46b9bb7115 SHA1 ea4f1a9b1ee7a7826b90422ae90725f3c55061ef SHA256 cbe23932c9ea87ec59cf3ba5a1ab4b2673d834ee6decb66becbecd7a9e3449ed
+EBUILD zlib-1.2.7.ebuild 2369 RMD160 3f9912653d232b4898031a69cbca417c14408956 SHA1 94bc432f5565a6fc0e07181379dcb57c85531c00 SHA256 d2dd81091209d39e858727208d0e96e3f61e822b6342ca587894cbcc3fdac63d
+MISC ChangeLog 14506 RMD160 282a229b67fed307b2fcca5e3cf168edf71e1e86 SHA1 2b160fb7b19e1b260bb7e08edabc3a1c612cc07c SHA256 66574162b092dd41dd141903df21690893a8efd7bf6b7a35a39a73e9b693afb1
 MISC metadata.xml 273 RMD160 8a4efa30c007f6bd676dd9b7caee92b096ba8b72 SHA1 89495834d604d9aba2d9a765cb7feeff44430978 SHA256 bb3ecfbae6d5e5ed47a494e99378545b9e66a0bdbced6f1d5120155f9e068a5d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+gOGMACgkQVWmRsqeSphN+FACfS37oX8G7CGtRZXsNBhEAkPCY
-S9gAn2fniKTi+mghJcFbiEamZ+hZyF3o
-=fkpk
+iQIcBAEBAgAGBQJPoq6+AAoJELEHsLL7fEFWRbkP/01tvYYKwfDwS73sou2c3Ogp
+syA+a4QQ9H3imFGn376zlSWvzGOQJM4vjEImGMLYXEjDoN728cmeAnbGCHU2UcAd
+2tfGVoR42m/Hq/KvPWaJAz831oiPjiAtbxg4SkFuS9FttKebjzpwEuO+ySwrscgR
+6hhPvr3/Qsn3KHhJB776DFTjIEoJnZUsbkXGlBah4rK/VwsWWo5+DPP6xDD0W1xl
+4se/Hlwd+v55CnO7S+Xt6O96tjzKz7Hn058Kk+VoxAsKktMfe9q0YsUqi2UXF0EN
+VayGCVzAyNy79zdoc928KlS3MVbRZF9DOQJe5SG1fQHJi7Bg/eHewFWp29Kt2eVR
+LioxypkHSN9+qHUjgtseIS2LNDBKS2fSCbZO/1fVe8lips5dqa4f1GLesIey8kQ3
+nwNTLIiC9knC+QrpIUbIwLGoYduRUbBDvX90iFiIF+ogeQxPAZ6iSrPOTx8oxYhy
+07DD/sTk1wggiQ/oZLgUecT+ZKPKrWj2+O4zjrBqhqSL1nTd4dfbYx86wYGR1eDo
+3NJeZyT3pqDS2cZCXsFJIciz09oRLxQ4UfJT5v22K8OHIrOBGoC0GKAZQiMgcphU
+9/mQ+f2zsound7rPB9FtziF28hyZagtAXL4GA3EWe93j0DFF4MZFxnmrN7Jcz11E
+0Olwz7PCm+BBFsdqXk7H
+=zMV8
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.7.ebuild b/sys-libs/zlib/zlib-1.2.7.ebuild
new file mode 100644
index 000000000000..e9f39c47b120
--- /dev/null
+++ b/sys-libs/zlib/zlib-1.2.7.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.7.ebuild,v 1.1 2012/05/03 16:12:52 vapier Exp $
+
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit autotools 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 ~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
+		;;
+	*)	# 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}
+}