diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-09-21 21:18:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-21 21:18:15 +0000 |
| commit | aabfdb634cea57d96f20cfcfaf177e9ce5a26387 (patch) | |
| tree | ccda17f9e1376ec5ae6fd20f928e381eb4864a66 /sys-libs/zlib | |
| parent | zlib-1.2.5 fix (bug #384019); more use flags for libsdl (diff) | |
| download | historical-aabfdb634cea57d96f20cfcfaf177e9ce5a26387.tar.gz historical-aabfdb634cea57d96f20cfcfaf177e9ce5a26387.tar.bz2 historical-aabfdb634cea57d96f20cfcfaf177e9ce5a26387.zip | |
Also rename macros in new minizip headers.
Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/zlib')
| -rw-r--r-- | sys-libs/zlib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-libs/zlib/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.5.1-r2.ebuild | 13 |
3 files changed, 17 insertions, 11 deletions
diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog index 11fae272abf7..e40d59564d0a 100644 --- a/sys-libs/zlib/ChangeLog +++ b/sys-libs/zlib/ChangeLog @@ -1,6 +1,9 @@ # 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.95 2011/09/21 19:36:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.96 2011/09/21 21:18:15 vapier Exp $ + + 21 Sep 2011; Mike Frysinger <vapier@gentoo.org> zlib-1.2.5.1-r2.ebuild: + Also rename macros in new minizip headers. *zlib-1.2.5.1-r2 (21 Sep 2011) diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index 68a7f33f5489..6a7c3a22957c 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -22,14 +22,14 @@ DIST zlib-1.2.5.tar.bz2 486374 RMD160 c6c4c2a2a205061b21487e69234106f5517b4b32 S 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 2696 RMD160 9904a4be5e26602d3c2e1b59bce474ecd675e524 SHA1 77544b9a70d37cce5a9af1d62eeb386ad6e704d0 SHA256 8aadaca399bf8ad5b45e93e4d03ee17aac2c610a27ae723e75bf4542aa6856b9 +EBUILD zlib-1.2.5.1-r2.ebuild 2781 RMD160 21042128da9ab1c771c730c1afc8c6735b4ed23b SHA1 9a23d11cb3f6274fc0789dff0430c523e42762c5 SHA256 ec1b2e9c38e701ef820677171bd2625f85d1c251dc98b9f467d362599287ce7e EBUILD zlib-1.2.5.1.ebuild 1969 RMD160 fd7596c2f8d93859ae68329622b93b3c2cb3eca6 SHA1 4fb8715b7b760e8e8bd8d7558f2c61791dc1bf38 SHA256 6e6f0643c77d90a425c288f1e6097bff27cb5bac8ce2070ec3c0526d69ef6280 -MISC ChangeLog 13824 RMD160 1ac4447f211b65f7585c6f9488612108f05d23b4 SHA1 15f01d7978c9765350ec31060475afa5bf4e868b SHA256 0038a9e4c2eaf5e51e04b2e41a1c8f55f72a09ffc11a6fc1358fca6919fd25e5 +MISC ChangeLog 13944 RMD160 62295b7b7711c6e5f68fe3d23aa04ed45df681b4 SHA1 476afd52af9240fa2576616c309bbc4938a021d5 SHA256 67fbf9f5bd1059bbd8597dd1535224d6b4db783ff80564647ee4f95988f58816 MISC metadata.xml 269 RMD160 63bbf881a18eb43b70b7ffb6af5558192058ee53 SHA1 9ba95b82087621f9e7cb966b00ce81b367e39ac9 SHA256 ff07e786e28da9cde8f02f75cae044a5f640ce396f3e62419d48da1367f0014c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk56PMAACgkQaC/OocHi7JYSBwD/b7XxB/Kz7ZD88KwkvuGt2TTr -i5UV0IWc8UbO9lNJweUA/iVz9O639KBv+8RMs5sAz3tndqb+S93FdGe1GwWKwKHE -=kxTm +iF4EAREIAAYFAk56VJ4ACgkQaC/OocHi7JYaOgD8C/RQq5UP0qICfahrYxqoC8jV +/Xmu+4Pv1KJgaUKIc/IA/RK+G8xl8iRrmDgKo/Iz7zIdCm3IlSfmyBhBbxuPLEm0 +=6Ibj -----END PGP SIGNATURE----- diff --git a/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild b/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild index 4d8fbc704173..e01908921581 100644 --- a/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild +++ b/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild,v 1.1 2011/09/21 19:36:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5.1-r2.ebuild,v 1.2 2011/09/21 21:18:15 vapier Exp $ inherit autotools eutils toolchain-funcs @@ -62,6 +62,11 @@ src_compile() { 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*) @@ -78,18 +83,16 @@ src_install() { *) emake install DESTDIR="${D}" LDCONFIG=: || die gen_usr_ldscript -a z + sed_macros "${D}"/usr/include/*.h ;; esac - # 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' "${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 |