Add extra patch to build with GCC 4.1 on FreeBSD.

Package-Manager: portage-2.1_rc4-r3

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 933524a15408ff88006d14257b3f1e26df632a26..3b0062875652f7bcc598e3a3fb921de3ac50c254 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.195 2006/06/01 04:47:40 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.196 2006/06/07 13:01:51 flameeyes Exp $
+
+  07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gnupg-1.9.20-fbsd-gcc41.patch, gnupg-1.9.20-r3.ebuild:
+  Add extra patch to build with GCC 4.1 on FreeBSD.
 
   01 Jun 2006; Thomas Cort <tcort@gentoo.org> gnupg-1.9.20-r3.ebuild:
   Stable on alpha wrt Bug #132343.

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index b457f7b5c9627244ee62d6207a143ce1c4eeb2ff..b0982bc06c7e3d1c7792d9034e08896e369619bd 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,20 +1,97 @@
-MD5 0b1424ab9413e161a146f74585056c5f ChangeLog 31486
-MD5 bc94c18c95c8b0e7f438a7f8bae67ee9 files/digest-gnupg-1.4.2.2 714
-MD5 cc4e04dad418f08cb3eef8edf326b35f files/digest-gnupg-1.4.3 708
-MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r3 244
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnupg-1.4-emptytrustpackets.patch 611 RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 SHA1 5de97cdd26d155132c828db89b28cd37e9f03aad SHA256 d7a2cfed32f0fef29edf0506fc3602473cc2c6369d672571d06bff902c9e0689
 MD5 c0b3223dbc599c2da7707cdae2b3683a files/gnupg-1.4-emptytrustpackets.patch 611
+RMD160 b87072acd446cebeb9b837ac6bba21c9c761e0c6 files/gnupg-1.4-emptytrustpackets.patch 611
+SHA256 d7a2cfed32f0fef29edf0506fc3602473cc2c6369d672571d06bff902c9e0689 files/gnupg-1.4-emptytrustpackets.patch 611
+AUX gnupg-1.4.2-jari.patch 370 RMD160 93e4099381de6cefadacf28ffd170b3cd5585c9f SHA1 6d8527bd0080d63ea851780a5394e0fd6eb00183 SHA256 d244d5d6f9f9e01f0cad2577d23c506f11e073210efbd48702ab62847cc60e73
 MD5 c23d51ccf048f10b5e8b10b45570c13a files/gnupg-1.4.2-jari.patch 370
+RMD160 93e4099381de6cefadacf28ffd170b3cd5585c9f files/gnupg-1.4.2-jari.patch 370
+SHA256 d244d5d6f9f9e01f0cad2577d23c506f11e073210efbd48702ab62847cc60e73 files/gnupg-1.4.2-jari.patch 370
+AUX gnupg-1.4.2-keyserver.patch 389 RMD160 ce11305302e2c9777913a7697c44195844fce1d2 SHA1 07d32cdd02526046b66ea4c3e697702d529a6673 SHA256 7f2a020d9fb5a8f7d4dd94f6e70168a348713afb66ad2088123a76e5e439030b
 MD5 ee3a4487eadfb9858f32adde3554394c files/gnupg-1.4.2-keyserver.patch 389
+RMD160 ce11305302e2c9777913a7697c44195844fce1d2 files/gnupg-1.4.2-keyserver.patch 389
+SHA256 7f2a020d9fb5a8f7d4dd94f6e70168a348713afb66ad2088123a76e5e439030b files/gnupg-1.4.2-keyserver.patch 389
+AUX gnupg-1.4.2-mpicoder.patch 991 RMD160 72d876fdec86f491b729ccaf95be9d0d1053a8f6 SHA1 55517a6a2ff7c0cc027c4d3fdf5d082522cee1eb SHA256 af1c3a0420546226eaa420728a06e9d8eb74e73f17cf4c350aeaebdfdc2bed0b
 MD5 fb96d149b5fc7dacc041dda2a57b2315 files/gnupg-1.4.2-mpicoder.patch 991
+RMD160 72d876fdec86f491b729ccaf95be9d0d1053a8f6 files/gnupg-1.4.2-mpicoder.patch 991
+SHA256 af1c3a0420546226eaa420728a06e9d8eb74e73f17cf4c350aeaebdfdc2bed0b files/gnupg-1.4.2-mpicoder.patch 991
+AUX gnupg-1.4.2.2-badruman.patch 558 RMD160 11954ae9fd632244781877c00b2531c6eea32583 SHA1 dc81d6d202207177756f35020f583b6895615af3 SHA256 6cdb944d17df449f2cdce1a255c6fd83e1f4a34edd4d6e5c691bcc1d3c418257
 MD5 04c1fed4cbc17d814bbdbf09cc1d9000 files/gnupg-1.4.2.2-badruman.patch 558
+RMD160 11954ae9fd632244781877c00b2531c6eea32583 files/gnupg-1.4.2.2-badruman.patch 558
+SHA256 6cdb944d17df449f2cdce1a255c6fd83e1f4a34edd4d6e5c691bcc1d3c418257 files/gnupg-1.4.2.2-badruman.patch 558
+AUX gnupg-1.4.2.2-selftest.patch 1374 RMD160 4ed131ac7605de9b672395208a10443146cbd23a SHA1 c4ca7ae9482ee66b1aef4a59e969cf54280d9451 SHA256 22ed605597427c06103e7a75d5cdc5c0acf72d60300ffaed9cab4c2bf94aceef
 MD5 81f86906b16ceca11d4820e173203475 files/gnupg-1.4.2.2-selftest.patch 1374
+RMD160 4ed131ac7605de9b672395208a10443146cbd23a files/gnupg-1.4.2.2-selftest.patch 1374
+SHA256 22ed605597427c06103e7a75d5cdc5c0acf72d60300ffaed9cab4c2bf94aceef files/gnupg-1.4.2.2-selftest.patch 1374
+AUX gnupg-1.4.2.2-test.patch 282 RMD160 2d89417dd346961f2b4fc311910e712549bea743 SHA1 c4d30ea2a4db5c10579b9dbbe29a80859460f477 SHA256 d223c78eee6c38d23e2283c48b8c553c88ff624c0075775a88dcea34c5e88081
 MD5 c1f0da84dd36a25d22814b3ee959f9c7 files/gnupg-1.4.2.2-test.patch 282
+RMD160 2d89417dd346961f2b4fc311910e712549bea743 files/gnupg-1.4.2.2-test.patch 282
+SHA256 d223c78eee6c38d23e2283c48b8c553c88ff624c0075775a88dcea34c5e88081 files/gnupg-1.4.2.2-test.patch 282
+AUX gnupg-1.4.3-badruman.patch 533 RMD160 fc42565de056e991229c3df763cc6a45ef0c47fb SHA1 a409ef9868d2c42d1b7d2926b19e35ea8263fd68 SHA256 17f10c73dce054112694a0325c78f2d25521ce1cf26bdb7c0e7d21ee2bab4274
 MD5 ee3ef9bfeaef0488113e6e0adc01575a files/gnupg-1.4.3-badruman.patch 533
+RMD160 fc42565de056e991229c3df763cc6a45ef0c47fb files/gnupg-1.4.3-badruman.patch 533
+SHA256 17f10c73dce054112694a0325c78f2d25521ce1cf26bdb7c0e7d21ee2bab4274 files/gnupg-1.4.3-badruman.patch 533
+AUX gnupg-1.4.3-jari.patch 465 RMD160 feef407fbdec662b063ead87b43ce3ce8a2d4d94 SHA1 055120c84892a0be378334bee863eb533736aa2d SHA256 09ed913655928debbdf91632e2a396e3aa6ceb7bd86f6f0f3b001c76440087a0
 MD5 e5dfde6c734ebd5cce85eec527be99e7 files/gnupg-1.4.3-jari.patch 465
+RMD160 feef407fbdec662b063ead87b43ce3ce8a2d4d94 files/gnupg-1.4.3-jari.patch 465
+SHA256 09ed913655928debbdf91632e2a396e3aa6ceb7bd86f6f0f3b001c76440087a0 files/gnupg-1.4.3-jari.patch 465
+AUX gnupg-1.4.3-keyserver.patch 455 RMD160 c7eec6bd5ea73cde4d084cffcc1623bea775aa9e SHA1 48818a3a333a4a8a7175f8c21ec2e811b3fd20c3 SHA256 242a8497230a75e2f4c9a34a91aef73560052925eff822d1e5e566faee8b27ec
 MD5 72be0b19653d4f2b1d1719046db9c18a files/gnupg-1.4.3-keyserver.patch 455
+RMD160 c7eec6bd5ea73cde4d084cffcc1623bea775aa9e files/gnupg-1.4.3-keyserver.patch 455
+SHA256 242a8497230a75e2f4c9a34a91aef73560052925eff822d1e5e566faee8b27ec files/gnupg-1.4.3-keyserver.patch 455
+AUX gnupg-1.4.3-selftest.patch 1324 RMD160 0a8e6d50fde48a2e795907ca56e1e95261919f43 SHA1 0003ffe4d032ace008e6d6ebca364327225a097f SHA256 0ca949d63f7dbb882c0119344c47bfaa99132bb4c7f253194eea06c7472afa54
 MD5 5618a0682f3972bdee6a87da1af03ba6 files/gnupg-1.4.3-selftest.patch 1324
+RMD160 0a8e6d50fde48a2e795907ca56e1e95261919f43 files/gnupg-1.4.3-selftest.patch 1324
+SHA256 0ca949d63f7dbb882c0119344c47bfaa99132bb4c7f253194eea06c7472afa54 files/gnupg-1.4.3-selftest.patch 1324
+AUX gnupg-1.9.20-fbsd-gcc41.patch 462 RMD160 a15e134cf05134b9b1113b162c6e957ca11860aa SHA1 ad3ae023524feb58e5350759dd42509bafde7468 SHA256 c8d37aed71c5659d93f9a73f563abc59159a33990fda8a12a74f2bbfe07a961e
+MD5 2c895d4068081e568eec78426f1476af files/gnupg-1.9.20-fbsd-gcc41.patch 462
+RMD160 a15e134cf05134b9b1113b162c6e957ca11860aa files/gnupg-1.9.20-fbsd-gcc41.patch 462
+SHA256 c8d37aed71c5659d93f9a73f563abc59159a33990fda8a12a74f2bbfe07a961e files/gnupg-1.9.20-fbsd-gcc41.patch 462
+AUX gnupg-1.9.20-fbsd.patch 901 RMD160 bfc0dc40a8c42130ecac8e8e9b038949720ff115 SHA1 4df4a432824272a00bc80c1eb7975a593e76fc78 SHA256 049c13bf96998298c8ff74e62ab1f112357d8e0efce2da8ae8daa11cf1a81eb3
 MD5 f7c457e0e98e73e3b29bb770c45dd47c files/gnupg-1.9.20-fbsd.patch 901
+RMD160 bfc0dc40a8c42130ecac8e8e9b038949720ff115 files/gnupg-1.9.20-fbsd.patch 901
+SHA256 049c13bf96998298c8ff74e62ab1f112357d8e0efce2da8ae8daa11cf1a81eb3 files/gnupg-1.9.20-fbsd.patch 901
+DIST gnupg-1.4.0-ecc0.1.6.diff.bz2 16703 RMD160 1d98f70f2f13e96eed4482be9c3646342b46cf4d SHA256 9bb0b4b7b2fdc757410c332fbf6e41049169d5ee67a06f1b347dbd21cd583ce5
+DIST gnupg-1.4.2.2.tar.bz2 3034652 RMD160 cbbf3ffafa51fdf985c2562ecafccd72bc36ea0d SHA1 f5559ddb004e0638f6bd9efe2bac00134c5065ba SHA256 174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57
+DIST gnupg-1.4.3-ecc0.1.6.diff.bz2 18138 RMD160 609d0d280d0084c4463bcfaa770d1dab4790bb32 SHA256 35b22cb1ef93042733b8088fee3fb2eff3053c04d506316315295e0b0ea690f0
+DIST gnupg-1.4.3.tar.bz2 3114088 RMD160 f6d328785f41b74f97d25305c6fe95ad45bb70a5 SHA1 9e96b36e4f4d1e8bc5028c99fac674482cbdb370 SHA256 1d8d65e43751d833d4d49fa86df6fe97cebd00162dd0ced743470dca7e520da6
+DIST gnupg-1.9.20.tar.bz2 1810059 RMD160 3501de32f1526f64510a77fe3cc0905dd7fc8854 SHA1 557be26c21c114a3b345ce6b177fcb088883f827 SHA256 6272727e5a0e019743e8520a2ff6b42eb4cc89251cb5bbca73dda09cb765487e
+DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
+EBUILD gnupg-1.4.2.2.ebuild 7051 RMD160 2514b7622efac0ed018295131ccf0cdc2adf5213 SHA1 bbe43563923199bbc3a0700b9109ee2c67713fce SHA256 28109c5253fd126ff83e4703d2fc92e360d530a34a0ddd2dbc7636a7cb5e77b3
 MD5 89d58e8a7c3eedf2660c73a6784a5871 gnupg-1.4.2.2.ebuild 7051
+RMD160 2514b7622efac0ed018295131ccf0cdc2adf5213 gnupg-1.4.2.2.ebuild 7051
+SHA256 28109c5253fd126ff83e4703d2fc92e360d530a34a0ddd2dbc7636a7cb5e77b3 gnupg-1.4.2.2.ebuild 7051
+EBUILD gnupg-1.4.3.ebuild 6384 RMD160 c72bcd2fe78a775b4bf6557ea2b68008e4dba819 SHA1 cd52859b7fd521990271268bce912ee4223a6611 SHA256 d692a1629454419b6c3b118f8f67822b710a2f6fdf435dbe62d2073d2a3a189f
 MD5 a5ad331b3128b0bff375def48c4f47d1 gnupg-1.4.3.ebuild 6384
-MD5 85de7c184c2dc3b2cf7e486e4a6b3a0a gnupg-1.9.20-r3.ebuild 2751
+RMD160 c72bcd2fe78a775b4bf6557ea2b68008e4dba819 gnupg-1.4.3.ebuild 6384
+SHA256 d692a1629454419b6c3b118f8f67822b710a2f6fdf435dbe62d2073d2a3a189f gnupg-1.4.3.ebuild 6384
+EBUILD gnupg-1.9.20-r3.ebuild 2799 RMD160 a3f0822e3218f3d5d3fefb1107ba9abc8314435e SHA1 2c8218f5dfa1cd038fd17dec68f6ddf3bb8d95d5 SHA256 a33aa24ce80323df40d4b2e9814d6a80e53ce513c597afa844cd791f1b505aa0
+MD5 3179a3c29f157fe3ec975f9fab816bac gnupg-1.9.20-r3.ebuild 2799
+RMD160 a3f0822e3218f3d5d3fefb1107ba9abc8314435e gnupg-1.9.20-r3.ebuild 2799
+SHA256 a33aa24ce80323df40d4b2e9814d6a80e53ce513c597afa844cd791f1b505aa0 gnupg-1.9.20-r3.ebuild 2799
+MISC ChangeLog 31660 RMD160 9c6d27dcaaf056cbfc752f76925c9b14a3755c31 SHA1 3d3abf8f4a35aa266cf31c35f0beb3be2ee76ad8 SHA256 88cd1c7ced08415f4984e0a166e57a791388cacd690e8680f5db2afb17770ecc
+MD5 e85f4a9c0b86607b66e0ab3eb0d2bc86 ChangeLog 31660
+RMD160 9c6d27dcaaf056cbfc752f76925c9b14a3755c31 ChangeLog 31660
+SHA256 88cd1c7ced08415f4984e0a166e57a791388cacd690e8680f5db2afb17770ecc ChangeLog 31660
+MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
+RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
+SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 metadata.xml 481
+MD5 bc94c18c95c8b0e7f438a7f8bae67ee9 files/digest-gnupg-1.4.2.2 714
+RMD160 d63d0eb7227af8515715b2f16756d3289bc2cadd files/digest-gnupg-1.4.2.2 714
+SHA256 25fa4aa5eaea9962a865c2e6b0f123972c0111ee0999060b3aca8a17f087328f files/digest-gnupg-1.4.2.2 714
+MD5 cc4e04dad418f08cb3eef8edf326b35f files/digest-gnupg-1.4.3 708
+RMD160 9bfc71ad352871b75a329439caaff906a1c5397f files/digest-gnupg-1.4.3 708
+SHA256 8e3cf65fbdae1fd9e4657caa33e005261988c8bea3fa62e518d07d863675b7d3 files/digest-gnupg-1.4.3 708
+MD5 b5311626934af7a07b0760601cc3db45 files/digest-gnupg-1.9.20-r3 244
+RMD160 2cee39773952b56927ea28d0eb108c517493c002 files/digest-gnupg-1.9.20-r3 244
+SHA256 a3f14c72acb1d4aa2102ab2ef7d02f12ae0451eef8528fed05a59b07e733d3d0 files/digest-gnupg-1.9.20-r3 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEhs50AiZjviIA2XgRAhSFAKCx354E8VCDbKgu2ssJsVaJCkhRcgCfQxt+
+FV7tzoiRV5ySLQo/7+RWdCI=
+=+SD9
+-----END PGP SIGNATURE-----

diff --git a/app-crypt/gnupg/files/gnupg-1.9.20-fbsd-gcc41.patch b/app-crypt/gnupg/files/gnupg-1.9.20-fbsd-gcc41.patch
new file mode 100644 (file)
index 0000000..bb74007
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.9.20-fbsd-gcc41.patch
@@ -0,0 +1,22 @@
+Index: gnupg-1.9.20/tools/gpgparsemail.c
+===================================================================
+--- gnupg-1.9.20.orig/tools/gpgparsemail.c
++++ gnupg-1.9.20/tools/gpgparsemail.c
+@@ -145,17 +145,6 @@ xstrdup (const char *string)
+   return p;
+ }
+ 
+-static char *
+-stpcpy (char *a,const char *b)
+-{
+-  while (*b)
+-    *a++ = *b++;
+-  *a = 0;
+-  
+-  return (char*)a;
+-}
+-
+-
+ static int
+ run_gnupg (int smime, int sig_fd, int data_fd, int *close_list)
+ {

diff --git a/app-crypt/gnupg/gnupg-1.9.20-r3.ebuild b/app-crypt/gnupg/gnupg-1.9.20-r3.ebuild
index 087beda3f09146140a123c903e781f1baed4b49b..dcf4f6bf33a8ac99fbbbb91eb2d0398163bd7960 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.9.20-r3.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.20-r3.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-crypt/gnupg/gnupg-1.9.20-r3.ebuild,v 1.6 2006/06/01 04:47:40 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.20-r3.ebuild,v 1.7 2006/06/07 13:01:51 flameeyes Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -48,6 +48,7 @@ src_unpack() {
        sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c || die "PIC patching failed"
 
        epatch "${FILESDIR}/${P}-fbsd.patch"
+       epatch "${FILESDIR}/${P}-fbsd-gcc41.patch"
        AT_M4DIR="m4 gl/m4" eautoreconf
 }