Fix from Paul Bredbury to make sure we respect CPPFLAGS #194264.

Package-Manager: portage-2.1.3.11

3 files changed, 27 insertions, 29 deletions

diff --git a/app-arch/unzip/ChangeLog b/app-arch/unzip/ChangeLog
index 2a25db4d8d54..47a7e8d85b8c 100644
--- a/app-arch/unzip/ChangeLog
+++ b/app-arch/unzip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/unzip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.48 2007/02/21 20:03:56 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.49 2007/10/06 14:17:07 vapier Exp $
+
+  06 Oct 2007; Mike Frysinger <vapier@gentoo.org> unzip-5.52-r1.ebuild:
+  Fix from Paul Bredbury to make sure we respect CPPFLAGS #194264.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index bc869ff02f97..e8fc6c2cc912 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX unzip-5.50-dotdot.patch 3236 RMD160 11c7242a572d593c9fe2e87a26fa9e8caed9ea9b SHA1 6cd63bc6d92a63b8b2de5a5be66bceab46a5dc51 SHA256 0a9631d6c14c72704595bababea83406519c7a864736c82ffe0efc446ade1731
 MD5 3b01796cbe10d9492bd8c0825bc83544 files/unzip-5.50-dotdot.patch 3236
 RMD160 11c7242a572d593c9fe2e87a26fa9e8caed9ea9b files/unzip-5.50-dotdot.patch 3236
@@ -6,34 +9,26 @@ AUX unzip-5.52-no-exec-stack.patch 334 RMD160 81d73b5bb66fb54f8f71252c1fe6e2036d
 MD5 75f5cdf093a1cd6c05465e48cf7535d0 files/unzip-5.52-no-exec-stack.patch 334
 RMD160 81d73b5bb66fb54f8f71252c1fe6e2036d488de9 files/unzip-5.52-no-exec-stack.patch 334
 SHA256 8e165db2c138f9729020f3e60e9d8be58d504f4cf8eb7aae18b9432d2d751d4f files/unzip-5.52-no-exec-stack.patch 334
-DIST unzip550.tar.gz 1068662 RMD160 4eb8e5b4130b523681dd5ccf9c2f1434f9695c98 SHA1 51034a8098eddc8facb4db9ea1a935e813dbdb73 SHA256 c01fbf95570fe347c49d51a5df246302a51cad4902eddba7efd8fff59a049138
 DIST unzip552.tar.gz 1140291 RMD160 b749b0923bc4cceaa6f937aef688e9713a84328c SHA1 1831bd59b9e607a69052f83b263384895e2d4a19 SHA256 145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
-EBUILD unzip-5.50-r2.ebuild 1129 RMD160 29d6063996ebafdffe3771fe5a20a611ee5d022f SHA1 6e951747b2cbcfd9b57ec157ecd652599a68fd03 SHA256 18e6e03518e47f778585140e5b260befef6bb53ed2e73298f57ee94bd78d7fe7
-MD5 4c9cca80bd3bde938e8921913622b498 unzip-5.50-r2.ebuild 1129
-RMD160 29d6063996ebafdffe3771fe5a20a611ee5d022f unzip-5.50-r2.ebuild 1129
-SHA256 18e6e03518e47f778585140e5b260befef6bb53ed2e73298f57ee94bd78d7fe7 unzip-5.50-r2.ebuild 1129
-EBUILD unzip-5.52-r1.ebuild 1679 RMD160 9ff8b1521e69c6a84c404836516cfecab60a2e6d SHA1 4290506abb00cb4a3c15fa797d259bbc82c5159d SHA256 f4933a6af6a08a1a8453b717b72e2dd0d8a57e1a041c7da6a9d2f241b1ce6701
-MD5 de4b979823d6b3f64d37fca75e649033 unzip-5.52-r1.ebuild 1679
-RMD160 9ff8b1521e69c6a84c404836516cfecab60a2e6d unzip-5.52-r1.ebuild 1679
-SHA256 f4933a6af6a08a1a8453b717b72e2dd0d8a57e1a041c7da6a9d2f241b1ce6701 unzip-5.52-r1.ebuild 1679
-EBUILD unzip-5.52.ebuild 1381 RMD160 5148ef12936e0278e2019023f0f34dd933ab8090 SHA1 fcb70e7a5572197143804438408ae47c4e9a2017 SHA256 b324d661841e7ef368324d788bb688e57e02d77dee14cf9102ab9fc9386df1cc
-MD5 2198d63ec92c112094cb1d8f5e1950dc unzip-5.52.ebuild 1381
-RMD160 5148ef12936e0278e2019023f0f34dd933ab8090 unzip-5.52.ebuild 1381
-SHA256 b324d661841e7ef368324d788bb688e57e02d77dee14cf9102ab9fc9386df1cc unzip-5.52.ebuild 1381
-MISC ChangeLog 5474 RMD160 945f145a216861562c9207e5b495078fd2cbcb12 SHA1 08befbb3cb77e2a72714b6501c63567bf501cd78 SHA256 b8e7a0aaadd9b2f4f73ee9cd7825a787b811c5b74c8d20e871a9aafa63cbf6d4
-MD5 8c18ec9154fb83b6c8be3461f8bebafe ChangeLog 5474
-RMD160 945f145a216861562c9207e5b495078fd2cbcb12 ChangeLog 5474
-SHA256 b8e7a0aaadd9b2f4f73ee9cd7825a787b811c5b74c8d20e871a9aafa63cbf6d4 ChangeLog 5474
+EBUILD unzip-5.52-r1.ebuild 1681 RMD160 0f370365ab1c169257e75f45f30f7ac865dcd5c0 SHA1 9eaacc04a19ddf0618c6eb076114aa6345db6923 SHA256 c09d587a984e8bb2e968326e7f2e130a17b5c7de1c8fcea77ac2dd1a37801bf0
+MD5 0966f1c0d7ced2cfb47ddd18a70fa92b unzip-5.52-r1.ebuild 1681
+RMD160 0f370365ab1c169257e75f45f30f7ac865dcd5c0 unzip-5.52-r1.ebuild 1681
+SHA256 c09d587a984e8bb2e968326e7f2e130a17b5c7de1c8fcea77ac2dd1a37801bf0 unzip-5.52-r1.ebuild 1681
+MISC ChangeLog 5615 RMD160 e6d40c2b68e7744f905e014b25b3cc14a7a7921e SHA1 22795f17bb6d7210f11360b712ab2c57fe14d700 SHA256 32d894cdb3fb385760e665ca952352d193654d4c84b2caf5e20e9e4c9304a7ed
+MD5 b60d49f5627b6ba4e6f7332f4fca10fb ChangeLog 5615
+RMD160 e6d40c2b68e7744f905e014b25b3cc14a7a7921e ChangeLog 5615
+SHA256 32d894cdb3fb385760e665ca952352d193654d4c84b2caf5e20e9e4c9304a7ed ChangeLog 5615
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 03a8a50cb9fcdc83ceac08933abe7e4f files/digest-unzip-5.50-r2 229
-RMD160 dccac62867a11890fefb63f212a0d1c3a2af6824 files/digest-unzip-5.50-r2 229
-SHA256 ada74e532f25c75fc9ff4c85eb33ceb2b933907b14f728c44953df778214e16b files/digest-unzip-5.50-r2 229
-MD5 ee9202fe33b60c050a5f65de4d69bec4 files/digest-unzip-5.52 229
-RMD160 b5ea435df907108c5158bebb340ed73e605d43fc files/digest-unzip-5.52 229
-SHA256 be2db45669d3fb56f780e7c9f22ae73a9caaf8701bee3226d7d55d02b77d36b0 files/digest-unzip-5.52 229
 MD5 ee9202fe33b60c050a5f65de4d69bec4 files/digest-unzip-5.52-r1 229
 RMD160 b5ea435df907108c5158bebb340ed73e605d43fc files/digest-unzip-5.52-r1 229
 SHA256 be2db45669d3fb56f780e7c9f22ae73a9caaf8701bee3226d7d55d02b77d36b0 files/digest-unzip-5.52-r1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHB5jpp/wUKkr7RBoRAjfSAJ98SFRk/xIjW+3OjRYrK/y0fsbDWwCgzEUf
+QtZzpxojyqW/0WBLEK6hfPI=
+=P+kB
+-----END PGP SIGNATURE-----
diff --git a/app-arch/unzip/unzip-5.52-r1.ebuild b/app-arch/unzip/unzip-5.52-r1.ebuild
index f9637a668d5d..4806275256a0 100644
--- a/app-arch/unzip/unzip-5.52-r1.ebuild
+++ b/app-arch/unzip/unzip-5.52-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.52-r1.ebuild,v 1.19 2007/02/28 21:53:29 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.52-r1.ebuild,v 1.20 2007/10/06 14:17:07 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
-DESCRIPTION="Unzipper for pkzip-compressed files"
-HOMEPAGE="ftp://ftp.info-zip.org/pub/infozip/UnZip.html"
+DESCRIPTION="unzipper for pkzip-compressed files"
+HOMEPAGE="http://www.info-zip.org/"
 SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/${PN}${PV/.}.tar.gz"
 
 LICENSE="Info-ZIP"
@@ -20,8 +20,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
 	sed -i \
-		-e 's:-O3:$(CFLAGS):' \
-		-e 's:-O :$(CFLAGS) :' \
+		-e 's:-O3:$(CFLAGS) $(CPPFLAGS):' \
+		-e 's:-O :$(CFLAGS) $(CPPFLAGS) :' \
 		-e "s:CC=gcc :CC=$(tc-getCC) :" \
 		-e "s:LD=gcc :LD=$(tc-getCC) :" \
 		-e 's:LF2 = -s:LF2 = :' \