Fix by jk3064 for mingw headers #409801.

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

4 files changed, 25 insertions, 21 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index 254a40e85cb9..e4647f9e8836 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.101 2012/05/03 16:12:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.102 2012/05/03 19:08:41 vapier Exp $
+
+  03 May 2012; Mike Frysinger <vapier@gentoo.org> zlib-1.2.6.ebuild,
+  zlib-1.2.7.ebuild:
+  Fix by jk3064 for mingw headers #409801.
 
 *zlib-1.2.7 (03 May 2012)
 
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 6ce557e9ac00..c3dcf6e8519b 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -26,24 +26,24 @@ EBUILD zlib-1.2.5-r2.ebuild 1985 RMD160 51991cece3b068936d37ba832d51813536888d13
 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
-EBUILD zlib-1.2.7.ebuild 2369 RMD160 3f9912653d232b4898031a69cbca417c14408956 SHA1 94bc432f5565a6fc0e07181379dcb57c85531c00 SHA256 d2dd81091209d39e858727208d0e96e3f61e822b6342ca587894cbcc3fdac63d
-MISC ChangeLog 14506 RMD160 282a229b67fed307b2fcca5e3cf168edf71e1e86 SHA1 2b160fb7b19e1b260bb7e08edabc3a1c612cc07c SHA256 66574162b092dd41dd141903df21690893a8efd7bf6b7a35a39a73e9b693afb1
+EBUILD zlib-1.2.6.ebuild 2375 RMD160 93be6a74e4e69ecbda642ebece05bec32d41ad26 SHA1 7da0193ff3ed818079d6f390b476dae3aaefcfd0 SHA256 678becca220a7c23d0f498cc148e9a8af05ac8384a46578edf7a2b907bd837e9
+EBUILD zlib-1.2.7.ebuild 2368 RMD160 f5b02eaca2b306289bae8461946fd47291952cc2 SHA1 68963c19fea092b3e2003934da5b9bb8a22ccbad SHA256 41f898f19e7520fa2b38196e334770d195b27a56096cf7552cb3d5c57f4d33c6
+MISC ChangeLog 14640 RMD160 48b1898681e3618e8a277633b4ba8fed5f37f0bc SHA1 9b8158c62534a999b99ae6a38116114c4df9ae27 SHA256 cb326155e663bfe45fe381e17e58e24420b98c1994f7e65aeec9deff8fb21e76
 MISC metadata.xml 273 RMD160 8a4efa30c007f6bd676dd9b7caee92b096ba8b72 SHA1 89495834d604d9aba2d9a765cb7feeff44430978 SHA256 bb3ecfbae6d5e5ed47a494e99378545b9e66a0bdbced6f1d5120155f9e068a5d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBAgAGBQJPotfzAAoJELEHsLL7fEFWGoEP/ijCrg+X/Ecp9jeZBA+FJMfx
+XQWuTRd1BDB/KZP+TDY4V7DSbV151kfFc22h2SoRPYIlL3+AYRvGDgPiqgk/5Xj0
+i/IxfFua8MT+2o6NtYBtwGc8PafskVvQtUPAXPprbYnbKiKzxq1qkY3yBJLdXoYs
+f4h2t4ekTdiXCQP61QkkNVTM/Z3sDSRMDBmOnfFKkBrph2WZeaV+3uR/Kxel9Arf
+lcl5D0msh4cJYpWXlv61Q1uAIbqY2r+3j+OlwwWbDUwv3wVXDi2eB/7PrSQfwsJp
+EzLMc1RaWlt43D4oa28v6ed8jeNU9y4GAqhxWujlctam/1LJflDucx01uEjWKgj5
+MbrvObpNCByn8JyDr/hL1O3OvCgg3FFV7NnxnKj/CwNtS0csmUOnP0y2QVogEK8U
+J65pPw5cTVfzETPmfjVCDehTuN9X9ju6VS+UV40yc+LkBHId9ufXbD7RufQB58XL
+NVZ3dI/JBVuuM7ouLtCQ3fVIO4k0e8UJ4BAgxZC5n/cFyZw6y77aeksWt6TbIB6U
+s0VUNe8i5x07DwUN4Prs6PKzpSAM58Hodbfgxc/Ln04KSLB2sSnEZJhzcUyspjfR
+Y/BUj4XfjF9X9+iNyUmkQwg4RC13d83uPp3nCf7LJB/5pgiyiC8yEjQKORifDIAZ
+oFBh+Yf+x6XkTDBB1DrY
+=KXRI
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/zlib-1.2.6.ebuild b/sys-libs/zlib/zlib-1.2.6.ebuild
index 248cbb9ac6c8..f0cd9c0dfc99 100644
--- a/sys-libs/zlib/zlib-1.2.6.ebuild
+++ b/sys-libs/zlib/zlib-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2012/04/26 12:52:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.6.ebuild,v 1.4 2012/05/03 19:08:41 vapier Exp $
 
 AUTOTOOLS_AUTO_DEPEND="no"
 inherit autotools eutils toolchain-funcs
@@ -76,9 +76,9 @@ src_install() {
 	*)
 		emake install DESTDIR="${D}" LDCONFIG=: || die
 		gen_usr_ldscript -a z
-		sed_macros "${D}"/usr/include/*.h
 		;;
 	esac
+	sed_macros "${D}"/usr/include/*.h
 
 	dodoc FAQ README ChangeLog doc/*.txt
 
diff --git a/sys-libs/zlib/zlib-1.2.7.ebuild b/sys-libs/zlib/zlib-1.2.7.ebuild
index e9f39c47b120..4b6b16e56e7d 100644
--- a/sys-libs/zlib/zlib-1.2.7.ebuild
+++ b/sys-libs/zlib/zlib-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.7.ebuild,v 1.2 2012/05/03 19:08:41 vapier Exp $
 
 AUTOTOOLS_AUTO_DEPEND="no"
 inherit autotools toolchain-funcs
@@ -76,9 +76,9 @@ src_install() {
 	*)
 		emake install DESTDIR="${D}" LDCONFIG=: || die
 		gen_usr_ldscript -a z
-		sed_macros "${D}"/usr/include/*.h
 		;;
 	esac
+	sed_macros "${D}"/usr/include/*.h
 
 	dodoc FAQ README ChangeLog doc/*.txt