Use gmake instead of make when available (non-intrusive fix for FreeBSD). Add ~x86-fbsd keyword.

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 45 insertions, 29 deletions

diff --git a/app-arch/zip/ChangeLog b/app-arch/zip/ChangeLog
index b23b111b7964..1a357cc19526 100644
--- a/app-arch/zip/ChangeLog
+++ b/app-arch/zip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/zip
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.44 2006/04/23 16:44:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.45 2006/07/07 15:35:58 flameeyes Exp $
+
+  07 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> zip-2.31-r1.ebuild:
+  Use gmake instead of make when available (non-intrusive fix for FreeBSD).
+  Add ~x86-fbsd keyword.
 
   28 Apr 2006; Joshua Kinard <kumba@gentoo.org> zip-2.31.ebuild:
   Marked stable on mips.
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index b3f22daa01a3..1e65569da032 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,47 +1,54 @@
-AUX zip-2.3-unix_configure-pic.patch 444 RMD160 8fd81ff732abe0e6189cd593c98e0055a11dca36 SHA1 c08486c683a9a8d02dbb0d500f421b07c0bcc704 SHA256 3e348be7890f21280fceab6cb2a87f3020b08a31608ab93d1b5a53667760e556 size 444
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX zip-2.3-unix_configure-pic.patch 444 RMD160 8fd81ff732abe0e6189cd593c98e0055a11dca36 SHA1 c08486c683a9a8d02dbb0d500f421b07c0bcc704 SHA256 3e348be7890f21280fceab6cb2a87f3020b08a31608ab93d1b5a53667760e556
 MD5 6cf67950f3003a17d048c9a3ce4f243a files/zip-2.3-unix_configure-pic.patch 444
 RMD160 8fd81ff732abe0e6189cd593c98e0055a11dca36 files/zip-2.3-unix_configure-pic.patch 444
 SHA256 3e348be7890f21280fceab6cb2a87f3020b08a31608ab93d1b5a53667760e556 files/zip-2.3-unix_configure-pic.patch 444
-AUX zip-2.31-exec-stack.patch 407 RMD160 a27f0112dbbda418feef97b66240442190e8b5d7 SHA1 3043e8150222749b6f05fc10f8ab1c15da21c8d0 SHA256 108686d8854096422bd4895690a37202aee66757d0d2b43afa16d9fb914cbb29 size 407
+AUX zip-2.31-exec-stack.patch 407 RMD160 a27f0112dbbda418feef97b66240442190e8b5d7 SHA1 3043e8150222749b6f05fc10f8ab1c15da21c8d0 SHA256 108686d8854096422bd4895690a37202aee66757d0d2b43afa16d9fb914cbb29
 MD5 249bdbaf477c3e08661cd70e3e7aa5fa files/zip-2.31-exec-stack.patch 407
 RMD160 a27f0112dbbda418feef97b66240442190e8b5d7 files/zip-2.31-exec-stack.patch 407
 SHA256 108686d8854096422bd4895690a37202aee66757d0d2b43afa16d9fb914cbb29 files/zip-2.31-exec-stack.patch 407
-AUX zip-CAN-2004-1010.patch 673 RMD160 63050e116d9ce49b7b26654a9f88e90f0332d055 SHA1 a79841169babcf10721f1565adbd39b09fa6e67f SHA256 92ed24fad3d7dd9567f2771a14bbd4905ed36aaff71b37e89d919b1fcf07e431 size 673
+AUX zip-CAN-2004-1010.patch 673 RMD160 63050e116d9ce49b7b26654a9f88e90f0332d055 SHA1 a79841169babcf10721f1565adbd39b09fa6e67f SHA256 92ed24fad3d7dd9567f2771a14bbd4905ed36aaff71b37e89d919b1fcf07e431
 MD5 ceb628bca144581dbeff71136122a8e2 files/zip-CAN-2004-1010.patch 673
 RMD160 63050e116d9ce49b7b26654a9f88e90f0332d055 files/zip-CAN-2004-1010.patch 673
 SHA256 92ed24fad3d7dd9567f2771a14bbd4905ed36aaff71b37e89d919b1fcf07e431 files/zip-CAN-2004-1010.patch 673
-DIST zcrypt29.zip 20248 RMD160 701aa47d910b76c85a868b343912ebd2d849bdc3 SHA256 af6e0ffaf90b61f5dc7414131d4e26065003097ab17bdddf2bf512218d50027a size 20248
-DIST zip23.tar.gz 723283 size 723283
-DIST zip231.tar.gz 781641 size 781641
-EBUILD zip-2.3-r4.ebuild 1110 RMD160 6bb71b1c4baa70bf28c2396eb7dae96030eca179 SHA1 0f3782b81e8e5b517e65198a853b0570bf702906 SHA256 41c7618ea0f0762b970a213a8b73da5f9f03c837edcc3050f79db361c138af7b size 1110
+DIST zcrypt29.zip 20248 RMD160 701aa47d910b76c85a868b343912ebd2d849bdc3 SHA256 af6e0ffaf90b61f5dc7414131d4e26065003097ab17bdddf2bf512218d50027a
+DIST zip23.tar.gz 723283
+DIST zip231.tar.gz 781641 RMD160 4b58e5b4b00ce03ff47b967f4f4c32b205b67751 SHA1 34ba126eb3344b0a35ee1a00fff9639994c7aba4 SHA256 2d21c0ed60346bcaa47ff0c3369219602dca1733b83ec503e9e8108dc119f719
+EBUILD zip-2.3-r4.ebuild 1110 RMD160 6bb71b1c4baa70bf28c2396eb7dae96030eca179 SHA1 0f3782b81e8e5b517e65198a853b0570bf702906 SHA256 41c7618ea0f0762b970a213a8b73da5f9f03c837edcc3050f79db361c138af7b
 MD5 7a2b80d9c775f53e81a1dc80368fd681 zip-2.3-r4.ebuild 1110
 RMD160 6bb71b1c4baa70bf28c2396eb7dae96030eca179 zip-2.3-r4.ebuild 1110
 SHA256 41c7618ea0f0762b970a213a8b73da5f9f03c837edcc3050f79db361c138af7b zip-2.3-r4.ebuild 1110
-EBUILD zip-2.31-r1.ebuild 1242 RMD160 772972ed4388b25f771548295dad1563e5c35170 SHA1 8cdfc612ad1598c71a01c09a0582a9d390164f33 SHA256 8af4ca2adc8f46002c22634defde307a37af8d9173dae8eb51a4f3558efb021c size 1242
-MD5 2c11e0b9f8f9da782af1e54db7523fd9 zip-2.31-r1.ebuild 1242
-RMD160 772972ed4388b25f771548295dad1563e5c35170 zip-2.31-r1.ebuild 1242
-SHA256 8af4ca2adc8f46002c22634defde307a37af8d9173dae8eb51a4f3558efb021c zip-2.31-r1.ebuild 1242
-EBUILD zip-2.31.ebuild 1065 RMD160 18e198a12b7667a1327dfccc8c00547a19b4ed3b SHA1 1bb676b4e52582562349c43293eec2dcb1caebaa SHA256 8812efae354c65f31a0cf7c485dafd305859711c8735433f2fb6d3b94092d629 size 1065
+EBUILD zip-2.31-r1.ebuild 1332 RMD160 cbd22534bc4277542080ceb88e220efab058a9b1 SHA1 c0b69d4598601ed0b4a3185f334bc7a80cb021ca SHA256 37e79f2dc2eb4305bd2bf2cf19515a94bcda7b583873728b897c401cf0f2b868
+MD5 6de2aaa4cc27b46545de5078677ec91b zip-2.31-r1.ebuild 1332
+RMD160 cbd22534bc4277542080ceb88e220efab058a9b1 zip-2.31-r1.ebuild 1332
+SHA256 37e79f2dc2eb4305bd2bf2cf19515a94bcda7b583873728b897c401cf0f2b868 zip-2.31-r1.ebuild 1332
+EBUILD zip-2.31.ebuild 1065 RMD160 18e198a12b7667a1327dfccc8c00547a19b4ed3b SHA1 1bb676b4e52582562349c43293eec2dcb1caebaa SHA256 8812efae354c65f31a0cf7c485dafd305859711c8735433f2fb6d3b94092d629
 MD5 951ebc527a4c0563b65b3dd372b90ae9 zip-2.31.ebuild 1065
 RMD160 18e198a12b7667a1327dfccc8c00547a19b4ed3b zip-2.31.ebuild 1065
 SHA256 8812efae354c65f31a0cf7c485dafd305859711c8735433f2fb6d3b94092d629 zip-2.31.ebuild 1065
-MISC ChangeLog 5027 RMD160 3367dca02ae92788903567c42f00d2bae48483c6 SHA1 37b0f5f2180a07cfe7b38b845a5f98790a31983b SHA256 9a368d9be2e68b18b459cc9c39de78ce9c4a067475c84a51570444eb0a53abf5 size 5027
-MD5 0e2ec8ac4f56ff480b61458e884033fb ChangeLog 5027
-RMD160 3367dca02ae92788903567c42f00d2bae48483c6 ChangeLog 5027
-SHA256 9a368d9be2e68b18b459cc9c39de78ce9c4a067475c84a51570444eb0a53abf5 ChangeLog 5027
-MISC metadata.xml 317 RMD160 5e7c6a3c22a80b44134751a6f48f6f00a7b56d5b SHA1 1086418f730dd6748512d74d43df2b3ee2c9349f SHA256 401343ed43d706cd887573d1019e2e59e1bf2c6287674224698269fb5a4f891a size 317
+MISC ChangeLog 5206 RMD160 abae74aee24afcb0561ada8953b41c087a687e2d SHA1 a850292a60099bca805704d9058e0f50b8feb7de SHA256 11409bfc6557ae0925bf41a9c3d4f4d170c5f42c19b151eda285d856e213aa9a
+MD5 cc3056dbff33717cfacfcbdbb6efc5d9 ChangeLog 5206
+RMD160 abae74aee24afcb0561ada8953b41c087a687e2d ChangeLog 5206
+SHA256 11409bfc6557ae0925bf41a9c3d4f4d170c5f42c19b151eda285d856e213aa9a ChangeLog 5206
+MISC metadata.xml 317 RMD160 5e7c6a3c22a80b44134751a6f48f6f00a7b56d5b SHA1 1086418f730dd6748512d74d43df2b3ee2c9349f SHA256 401343ed43d706cd887573d1019e2e59e1bf2c6287674224698269fb5a4f891a
 MD5 3e2d9d6e97f8f2b0460d18dd2cb2cda9 metadata.xml 317
 RMD160 5e7c6a3c22a80b44134751a6f48f6f00a7b56d5b metadata.xml 317
 SHA256 401343ed43d706cd887573d1019e2e59e1bf2c6287674224698269fb5a4f891a metadata.xml 317
 MD5 c33712550dd9ca62a07adf2a82b99b71 files/digest-zip-2.3-r4 271
 RMD160 70def441afb5169b711848fce01bebee1a9b875a files/digest-zip-2.3-r4 271
 SHA256 e047fa293aa69f7b94e4f9ded4af2d9cb7ee6dd580e237cc2110accdf00a9e5a files/digest-zip-2.3-r4 271
-size 271 files/digest-zip-2.3-r4 271
-MD5 7503cc2d96c960db73a6ac7df4387adc files/digest-zip-2.31 272
-RMD160 60aaa1ece92434bb055122cdcbfab8bbc1e94f84 files/digest-zip-2.31 272
-SHA256 8dd7f40204e50492714c11a98d292ef7c4a46892fa7fb7ffa170d332c55e4b16 files/digest-zip-2.31 272
-size 272 files/digest-zip-2.31 272
-MD5 b009eed54f390241bea0b96110afb737 files/digest-zip-2.31-r1 58
-RMD160 2dcbeb8ad64bfa86d81132068c4809770aa6274a files/digest-zip-2.31-r1 58
-SHA256 09a91c4cb9863d895519ebf275f5c34dae3d1d3d9970fad58938f4a6f3bbe27d files/digest-zip-2.31-r1 58
-size 58 files/digest-zip-2.31-r1 58
+MD5 64026daeb4e0575d30c167d66a657ee1 files/digest-zip-2.31 434
+RMD160 c19d87e465d61f893493d595ef741f124a14f2cc files/digest-zip-2.31 434
+SHA256 72000c3bf5429b108586ad26d7e0c13404b12baf3d888a63c650612b2e5fce71 files/digest-zip-2.31 434
+MD5 d103097ec736cf08c219560409e649c1 files/digest-zip-2.31-r1 220
+RMD160 c52df324b040799b2ea44242732f64b84cfff452 files/digest-zip-2.31-r1 220
+SHA256 4b3c27466b3437a7ca0a87e9be377e84023d9e63e737733f165abff2a4e60d87 files/digest-zip-2.31-r1 220
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFErn9tAiZjviIA2XgRAsG+AJ9ecWgQayjdrFN1PEHvGnNUsSCJ3wCglDEf
+m2gzkOlSnk0MeAVemx6IbgI=
+=XfBW
+-----END PGP SIGNATURE-----
diff --git a/app-arch/zip/files/digest-zip-2.31 b/app-arch/zip/files/digest-zip-2.31
index 216de4c67c1c..b5bbf5de83ba 100644
--- a/app-arch/zip/files/digest-zip-2.31
+++ b/app-arch/zip/files/digest-zip-2.31
@@ -2,3 +2,5 @@ MD5 0c969ba1661183b041a142945ed2710e zcrypt29.zip 20248
 RMD160 701aa47d910b76c85a868b343912ebd2d849bdc3 zcrypt29.zip 20248
 SHA256 af6e0ffaf90b61f5dc7414131d4e26065003097ab17bdddf2bf512218d50027a zcrypt29.zip 20248
 MD5 6bfc076664416251d7624ab3538d1cb9 zip231.tar.gz 781641
+RMD160 4b58e5b4b00ce03ff47b967f4f4c32b205b67751 zip231.tar.gz 781641
+SHA256 2d21c0ed60346bcaa47ff0c3369219602dca1733b83ec503e9e8108dc119f719 zip231.tar.gz 781641
diff --git a/app-arch/zip/files/digest-zip-2.31-r1 b/app-arch/zip/files/digest-zip-2.31-r1
index ae8116620219..f7df085f3d9a 100644
--- a/app-arch/zip/files/digest-zip-2.31-r1
+++ b/app-arch/zip/files/digest-zip-2.31-r1
@@ -1 +1,3 @@
 MD5 6bfc076664416251d7624ab3538d1cb9 zip231.tar.gz 781641
+RMD160 4b58e5b4b00ce03ff47b967f4f4c32b205b67751 zip231.tar.gz 781641
+SHA256 2d21c0ed60346bcaa47ff0c3369219602dca1733b83ec503e9e8108dc119f719 zip231.tar.gz 781641
diff --git a/app-arch/zip/zip-2.31-r1.ebuild b/app-arch/zip/zip-2.31-r1.ebuild
index a37161d517ef..4811e23f2eb7 100644
--- a/app-arch/zip/zip-2.31-r1.ebuild
+++ b/app-arch/zip/zip-2.31-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.31-r1.ebuild,v 1.1 2006/03/14 03:13:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.31-r1.ebuild,v 1.2 2006/07/07 15:35:58 flameeyes Exp $
 
 inherit toolchain-funcs eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/zip${PV//.}.tar.gz"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="crypt"
 
 DEPEND=""
@@ -23,6 +23,7 @@ src_unpack() {
 	cd unix
 	use crypt || append-flags -DNO_CRYPT
 	sed -i -e "s:-O2:${CFLAGS}:" Makefile
+	[[ -n $(type -p gmake) ]] && sed -i -e '/^MAKE/ s:\<make\>:gmake:' Makefile
 }
 
 src_compile() {