Add patch to fix FreeBSD building (bug #136085) and mark ~x86-fbsd.

Package-Manager: portage-2.1_rc4-r5

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index 98d325d17b3096179c98eed31d74b9e50cfb97ee..183dbc4dc284c9e0bc5becf28acbba02bfe55da4 100644 (file)
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.96 2006/06/01 04:48:28 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.97 2006/06/08 23:27:05 flameeyes Exp $
+
+  08 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gpgme-1.1.2-fbsd.patch, gpgme-1.1.2-r1.ebuild:
+  Add patch to fix FreeBSD building (bug #136085) and mark ~x86-fbsd.
 
   01 Jun 2006; Thomas Cort <tcort@gentoo.org> gpgme-1.1.2-r1.ebuild:
   Stable on alpha wrt Bug #132343.

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 1be30838fdaea6ddab00954880062412e142b4b9..1d1d6a14dc292c46bec300c696eb1fd347d623ba 100644 (file)
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,14 +1,70 @@
-MD5 6cb7b1b15ecc36793c1204385bb64114 ChangeLog 14965
-MD5 6d9e14a1129260bd4cc6b4c8d43010ae files/digest-gpgme-0.3.14-r1 238
-MD5 521f6d4f448e96087507adaf3e2a16af files/digest-gpgme-1.0.2 235
-MD5 28ae8654b37b08ec26374f558e26cd7c files/digest-gpgme-1.0.3 235
-MD5 26ae1e7a5678f892b955b3464346cf12 files/digest-gpgme-1.1.0 235
-MD5 99dc1a35872dbab76543c104fc9e4c6b files/digest-gpgme-1.1.2-r1 235
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gpgme-1.1.0-pth-test.patch 1011 RMD160 e3088584b65c70a8f5af933f712a769aa3a4883d SHA1 47301e6a88d66d75f87b724e4576538b29b74406 SHA256 801b0dfb75308185dd0ce0ed08a572120bd1608f9db32b35641b2ed8956cfc54
 MD5 8308ab331091a74ef5f6f0567d48d208 files/gpgme-1.1.0-pth-test.patch 1011
+RMD160 e3088584b65c70a8f5af933f712a769aa3a4883d files/gpgme-1.1.0-pth-test.patch 1011
+SHA256 801b0dfb75308185dd0ce0ed08a572120bd1608f9db32b35641b2ed8956cfc54 files/gpgme-1.1.0-pth-test.patch 1011
+AUX gpgme-1.1.2-fbsd.patch 984 RMD160 dfe4d16c5b8c4256fef9344d0616cf2111a0d3ac SHA1 c9ee5603134610c7d5a04225fe2418acd32a1440 SHA256 3da2df975c1dc3d26cb7927489d9c5c610a953864b7cb3be6bebbf410eeeab58
+MD5 03ead303494786d8b8933e7e61b651b5 files/gpgme-1.1.2-fbsd.patch 984
+RMD160 dfe4d16c5b8c4256fef9344d0616cf2111a0d3ac files/gpgme-1.1.2-fbsd.patch 984
+SHA256 3da2df975c1dc3d26cb7927489d9c5c610a953864b7cb3be6bebbf410eeeab58 files/gpgme-1.1.2-fbsd.patch 984
+AUX gpgme3.m4.patch 482 RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc SHA1 2a42c91ea4636fab5b1087ba5542e9c79ca143b0 SHA256 8e71df251cbbed19cfb2e929c0781adb92b02fb32759349c62408ab108bcc2c3
 MD5 afc6d9e463f4b389eb085af310f8b74f files/gpgme3.m4.patch 482
+RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc files/gpgme3.m4.patch 482
+SHA256 8e71df251cbbed19cfb2e929c0781adb92b02fb32759349c62408ab108bcc2c3 files/gpgme3.m4.patch 482
+DIST gpgme-0.3.14.tar.gz 655474 RMD160 96d1db35441611d0ddc3e2e8824e2b1d673b9837 SHA256 4e822b5bb4f8d3269ab9d205e714ed9463b951c77e8ac0ffc0cf8ba7667bdc88
+DIST gpgme-1.0.2.tar.gz 833949 RMD160 444d6fa0e721ae099912692172dd9f2f40d8de33 SHA256 a9f1063dada8230571d35c4074e343da8234467f0900ebbb3e62526696a6a586
+DIST gpgme-1.0.3.tar.gz 837866 RMD160 cc8dc465c733eea8d7f0297127f9f97dd0876a53 SHA256 376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f
+DIST gpgme-1.1.0.tar.gz 862122 RMD160 f29903597e74ae637001a73ba9ae4cfd20802bf2 SHA256 a481bc118d8f6f55ef11be0ce3ac9b9834e992ab2381648626add502a910e2a1
+DIST gpgme-1.1.2.tar.gz 881432 RMD160 ae30dc9a3e1f482206cf7cf76aae7c9b9e25b4a8 SHA1 336d94e3bf2facedd06c52bd016bce647667c347 SHA256 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5
+EBUILD gpgme-0.3.14-r1.ebuild 2436 RMD160 fafa8b391d9f36bf26bb4a69973a9a1d363b9eb7 SHA1 fa17cec8dcfb0705fd55818a1609e9a759474d1d SHA256 20baadd19e4c7b1e6485ea2425ffed4f821c1d2fe260911d742defc1bc6f8907
 MD5 01c6d97b40dda97420a63cb2499101a5 gpgme-0.3.14-r1.ebuild 2436
+RMD160 fafa8b391d9f36bf26bb4a69973a9a1d363b9eb7 gpgme-0.3.14-r1.ebuild 2436
+SHA256 20baadd19e4c7b1e6485ea2425ffed4f821c1d2fe260911d742defc1bc6f8907 gpgme-0.3.14-r1.ebuild 2436
+EBUILD gpgme-1.0.2.ebuild 1901 RMD160 6093b17cc31a36d0b6b0e540ff097bda80601d25 SHA1 1ebc2d2edd0e5541ea2fdcf58d3a54402a8a3a1e SHA256 ce38e73f9f6e9c9680e23da153b1f87d2fb753de163d86625dfe45a6ae44a607
 MD5 30461cc0601654249f402132f3b8d286 gpgme-1.0.2.ebuild 1901
+RMD160 6093b17cc31a36d0b6b0e540ff097bda80601d25 gpgme-1.0.2.ebuild 1901
+SHA256 ce38e73f9f6e9c9680e23da153b1f87d2fb753de163d86625dfe45a6ae44a607 gpgme-1.0.2.ebuild 1901
+EBUILD gpgme-1.0.3.ebuild 1527 RMD160 01eefb27423f186d397c0df783c77dd9f9734f7e SHA1 242dfd67b3f547d05e91c71100fda58b605f2d44 SHA256 32a74f9972ec1d9d5af3e981421a487f446fce14594059acce05c87cbe51fdaa
 MD5 c2d5eb24b51350faf76c13725219ddc9 gpgme-1.0.3.ebuild 1527
+RMD160 01eefb27423f186d397c0df783c77dd9f9734f7e gpgme-1.0.3.ebuild 1527
+SHA256 32a74f9972ec1d9d5af3e981421a487f446fce14594059acce05c87cbe51fdaa gpgme-1.0.3.ebuild 1527
+EBUILD gpgme-1.1.0.ebuild 1667 RMD160 5a037efa7f09d9bf53977cd47e1ed024574ad5da SHA1 ddc5a9f40a8f80a74ce490a28c0df59278f4e65f SHA256 62c73bfffe6da91350cc6acb048289473bcbadd58eaf8c2b2dddd69ca2c79add
 MD5 13921b094794db02ff53f2631138fb77 gpgme-1.1.0.ebuild 1667
-MD5 823e391edafcf5cd6f50caf64aefc955 gpgme-1.1.2-r1.ebuild 1157
+RMD160 5a037efa7f09d9bf53977cd47e1ed024574ad5da gpgme-1.1.0.ebuild 1667
+SHA256 62c73bfffe6da91350cc6acb048289473bcbadd58eaf8c2b2dddd69ca2c79add gpgme-1.1.0.ebuild 1667
+EBUILD gpgme-1.1.2-r1.ebuild 1217 RMD160 214af8fe9f472abe8799a7fb582c95e79ec6d0d9 SHA1 d3faef80c623b84398d235a0281c0621beaaf3f1 SHA256 486c5b1d3a062a8ed902f0c738f06e03a3a7a90cfc00f45757827060b0cac328
+MD5 c8b0858630f2c011ab0e25205d0dc166 gpgme-1.1.2-r1.ebuild 1217
+RMD160 214af8fe9f472abe8799a7fb582c95e79ec6d0d9 gpgme-1.1.2-r1.ebuild 1217
+SHA256 486c5b1d3a062a8ed902f0c738f06e03a3a7a90cfc00f45757827060b0cac328 gpgme-1.1.2-r1.ebuild 1217
+MISC ChangeLog 15149 RMD160 1d748a16a53ec0a74e1f7f60dfcbee16ebce7b33 SHA1 7b5c11321aa95b194875a7ec192f845afc9dfa39 SHA256 43cabf035606af079fa5040b7a6e3ef8c4eade28b92f9c70e97908b12e8fccd4
+MD5 7f44c809ec69ec0df7810ed2321d723e ChangeLog 15149
+RMD160 1d748a16a53ec0a74e1f7f60dfcbee16ebce7b33 ChangeLog 15149
+SHA256 43cabf035606af079fa5040b7a6e3ef8c4eade28b92f9c70e97908b12e8fccd4 ChangeLog 15149
+MISC metadata.xml 314 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a SHA1 ac00fbb2fc2f2de37d5dda93c775ef53f979eb28 SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649
 MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
+RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a metadata.xml 314
+SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649 metadata.xml 314
+MD5 6d9e14a1129260bd4cc6b4c8d43010ae files/digest-gpgme-0.3.14-r1 238
+RMD160 f270bf806c6a14be99958c2f2ef016b7013a485b files/digest-gpgme-0.3.14-r1 238
+SHA256 a7074d65d46bc08e23725caa5ddceb1be6b0e9dd1c4dc26d84a4360e93858f47 files/digest-gpgme-0.3.14-r1 238
+MD5 521f6d4f448e96087507adaf3e2a16af files/digest-gpgme-1.0.2 235
+RMD160 598d9cbe43f143566b6f65b92c7602bd665f67da files/digest-gpgme-1.0.2 235
+SHA256 a9da78fa4e20893870349369ae508adbfd32a02b7d4bc3d0092f3f96a68c8958 files/digest-gpgme-1.0.2 235
+MD5 28ae8654b37b08ec26374f558e26cd7c files/digest-gpgme-1.0.3 235
+RMD160 c00ca5e21acd9c78b8ec5a3b445a9b7a28b11441 files/digest-gpgme-1.0.3 235
+SHA256 ac4f006290e32ddb251b81a7126923226e263444a758e6f26b9d16b7e12e81f4 files/digest-gpgme-1.0.3 235
+MD5 26ae1e7a5678f892b955b3464346cf12 files/digest-gpgme-1.1.0 235
+RMD160 d1b297ac6d5ef971d4d0e903e5300d10d0efe161 files/digest-gpgme-1.1.0 235
+SHA256 bdda20221709d21e8fa90075c72e86483061d5288f19a24ae1e5659350ba2291 files/digest-gpgme-1.1.0 235
+MD5 99dc1a35872dbab76543c104fc9e4c6b files/digest-gpgme-1.1.2-r1 235
+RMD160 026b14f8f1ab371fe3445549d126d8696870ca42 files/digest-gpgme-1.1.2-r1 235
+SHA256 2f33bdd8584b0943156f8f0538da536f7de767916ed5b30599a6e10367cbb98a files/digest-gpgme-1.1.2-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEiLJXAiZjviIA2XgRAs0SAKDnGm17fy743VSF5SN9eygY7+a2kQCdH3+d
+vltHWpSyJLNSSsXRRyhKTdc=
+=wUMc
+-----END PGP SIGNATURE-----

diff --git a/app-crypt/gpgme/files/gpgme-1.1.2-fbsd.patch b/app-crypt/gpgme/files/gpgme-1.1.2-fbsd.patch
new file mode 100644 (file)
index 0000000..564e6ac
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.1.2-fbsd.patch
@@ -0,0 +1,41 @@
+Index: gpgme-1.1.2/assuan/assuan.h
+===================================================================
+--- gpgme-1.1.2.orig/assuan/assuan.h
++++ gpgme-1.1.2/assuan/assuan.h
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <unistd.h>
+ 
+ 
+Index: gpgme-1.1.2/assuan/funopen.c
+===================================================================
+--- gpgme-1.1.2.orig/assuan/funopen.c
++++ gpgme-1.1.2/assuan/funopen.c
+@@ -38,7 +38,7 @@
+   cookie instead of the fiel descripor.
+ */
+ 
+-
++#ifndef HAVE_FUNOPEN
+ #ifdef HAVE_FOPENCOOKIE
+ FILE *
+ _assuan_funopen(void *cookie,
+@@ -61,3 +61,4 @@ _assuan_funopen(void *cookie,
+ #else
+ #error No known way to implement funopen.
+ #endif
++#endif
+Index: gpgme-1.1.2/assuan/mkerrors
+===================================================================
+--- gpgme-1.1.2.orig/assuan/mkerrors
++++ gpgme-1.1.2/assuan/mkerrors
+@@ -83,4 +83,4 @@ cat <<EOF
+   return s;
+ }
+ 
+-EOF
+\ No newline at end of file
++EOF

diff --git a/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild b/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild
index 655e454e4e71cb5f7197d714cae3ec61a1698712..4e61fd2a475897a03448bf919ffb30617942acde 100644 (file)
--- a/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild,v 1.8 2006/06/01 04:48:28 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild,v 1.9 2006/06/08 23:27:05 flameeyes Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpgme/index.html"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=dev-libs/libgpg-error-0.5
@@ -24,6 +24,8 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
 
+       epatch "${FILESDIR}/${P}-fbsd.patch"
+
        elibtoolize
 }