Add patch to build with GCC 4 and mark ~amd64.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 61 insertions, 21 deletions

diff --git a/sys-apps/mtree/ChangeLog b/sys-apps/mtree/ChangeLog
index 1d425683ce15..35b4a8733906 100644
--- a/sys-apps/mtree/ChangeLog
+++ b/sys-apps/mtree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/mtree
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.5 2004/06/24 22:18:35 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/ChangeLog,v 1.6 2006/04/18 23:28:58 flameeyes Exp $
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mtree-1.5-gcc4.patch, mtree-1.5.ebuild:
+  Add patch to build with GCC 4 and mark ~amd64.
 
   07 May 2004; David Holm <dholm@gentoo.org> mtree-1.5.ebuild:
   Added to ~ppc.
diff --git a/sys-apps/mtree/Manifest b/sys-apps/mtree/Manifest
index e662e3ef0fe4..f0821788f5d3 100644
--- a/sys-apps/mtree/Manifest
+++ b/sys-apps/mtree/Manifest
@@ -1,27 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST bootstrap-pkgsrc.tar.gz 1193805 size 1193805
-EBUILD mtree-1.5.ebuild 729 RMD160 aabc5214eaed579fef89aad1372f1193fa6bcce6 SHA1 87276906827c8c76518a9290da7e7b948f30713a SHA256 1633b92f026f71ed5ab7e6e13356f1956257d459772ef591d798a33b59b86454 size 729
-MD5 268d56848615894f6b03a1410dc08e54 mtree-1.5.ebuild 729
-RMD160 aabc5214eaed579fef89aad1372f1193fa6bcce6 mtree-1.5.ebuild 729
-SHA256 1633b92f026f71ed5ab7e6e13356f1956257d459772ef591d798a33b59b86454 mtree-1.5.ebuild 729
-MISC ChangeLog 594 RMD160 c40a6edc309a931875ff3a152d3a8e5a49a61f08 SHA1 a0fb7fe0ba3c0775c62bbf1067f72db1deb71153 SHA256 62c8e346e31944c63ac2b3acf1f338e0293d9f392468a4422c47c1a98f1a4639 size 594
-MD5 715722fc225f8924b73139613caf2d7f ChangeLog 594
-RMD160 c40a6edc309a931875ff3a152d3a8e5a49a61f08 ChangeLog 594
-SHA256 62c8e346e31944c63ac2b3acf1f338e0293d9f392468a4422c47c1a98f1a4639 ChangeLog 594
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
-SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+MD5 acbf8edb0953b616455e1b387697f050 ChangeLog 747
+RMD160 2e5cbdd6482c1f1a1d4711828fa7541996b78d88 ChangeLog 747
+SHA256 898cc8cdc4ec12bb6028a620f1225495c8959f75d45d7c388f13e27595502539 ChangeLog 747
 MD5 32078685fbbdab1173b28e5539156eac files/digest-mtree-1.5 69
 RMD160 1f308d349a0be0dbb5bfe2e2813c03a48337ab0b files/digest-mtree-1.5 69
 SHA256 300e570f0a77281c441ce2ca7a266e75e419bf8d724df82e7d02031b7d4ce5ff files/digest-mtree-1.5 69
-size 69 files/digest-mtree-1.5 69
+MD5 8804bc98d9c04729b5a51393e52a96c5 files/mtree-1.5-gcc4.patch 1417
+RMD160 314f940d6072b1cb559660199fb7a4ad91d04aa8 files/mtree-1.5-gcc4.patch 1417
+SHA256 66d9b65ee3841c1467f3dd5525eac6e608a8d52a786f9f2668f5e8847618f085 files/mtree-1.5-gcc4.patch 1417
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+MD5 9cbfc536f3786f4ffd49e880f00e6115 mtree-1.5.ebuild 836
+RMD160 6ba01c2946322cb7a6cb6073da4d4d86dd596c75 mtree-1.5.ebuild 836
+SHA256 3612db3af03fd7f273510baeb10d5da8e170ae90b5179b1c425fe84ed3bca16f mtree-1.5.ebuild 836
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFERXFz2+ySkm8kpY0RAlTDAJoCQTFJTVEVAY2hOC+DRlp8leimXACguIHJ
-JOg9MKhoUmPPlbHG1NzRNz8=
-=pIfq
+iD8DBQFERXWeAiZjviIA2XgRAgw5AKC75o/La+zRyO1PJJgRxSE2WWND8wCgsVpx
+sbXAE53jLZm9Zn6HaXONUwg=
+=UJxP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/mtree/files/mtree-1.5-gcc4.patch b/sys-apps/mtree/files/mtree-1.5-gcc4.patch
new file mode 100644
index 000000000000..a57feed85085
--- /dev/null
+++ b/sys-apps/mtree/files/mtree-1.5-gcc4.patch
@@ -0,0 +1,29 @@
+Index: bootstrap-pkgsrc/digest/sha2.h
+===================================================================
+--- bootstrap-pkgsrc.orig/digest/sha2.h
++++ bootstrap-pkgsrc/digest/sha2.h
+@@ -99,21 +99,21 @@ void SHA256_Init(SHA256_CTX *);
+ void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t);
+ void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
+ char* SHA256_End(SHA256_CTX*, u_char *);
+-char* SHA256_Data(const u_int8_t*, size_t, u_char *);
++char* SHA256_Data(const u_char*, size_t, u_char *);
+ char *SHA256_File(char *, char *);
+ 
+ void SHA384_Init(SHA384_CTX*);
+ void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t);
+ void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+ char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
+-char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
++char* SHA384_Data(const u_char*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
+ char *SHA384_File(char *, char *);
+ 
+ void SHA512_Init(SHA512_CTX*);
+ void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t);
+ void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+ char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
+-char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
++char* SHA512_Data(const u_char*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
+ char *SHA512_File(char *, char *);
+ 
+ #endif /* SHA2_USE_INTTYPES_H */
diff --git a/sys-apps/mtree/mtree-1.5.ebuild b/sys-apps/mtree/mtree-1.5.ebuild
index fcb2dd32e5bf..645f997e8936 100644
--- a/sys-apps/mtree/mtree-1.5.ebuild
+++ b/sys-apps/mtree/mtree-1.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-1.5.ebuild,v 1.6 2006/04/18 23:07:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mtree/mtree-1.5.ebuild,v 1.7 2006/04/18 23:28:58 flameeyes Exp $
+
+inherit eutils
 
 DESCRIPTION="check the permissions of a file system against a spec file"
 HOMEPAGE="http://www.netbsd.org/"
@@ -8,12 +10,19 @@ SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/packages/bootstrap-pkgsrc.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc s390 ~x86"
+KEYWORDS="~amd64 ~ppc s390 ~x86"
 IUSE=""
 DEPEND=""
 
 S=${WORKDIR}/bootstrap-pkgsrc
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+}
+
 src_compile() {
 	cd digest
 	chmod +x configure