Added patch to allow compilation on ppc-macos. Patch by exg at gentoo dot org

(Portage version: 2.1_pre4-r1)

5 files changed, 84 insertions, 13 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index f6e0cd323450..60f1d07bee46 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gpgme
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.82 2005/10/26 14:06:05 grobian Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.83 2006/02/20 20:30:09 grobian Exp $
+
+  20 Feb 2006; Fabian Groffen <grobian@gentoo.org>
+  +files/gpgme-1.1.0-pth-test.patch, gpgme-1.1.0.ebuild:
+  Added patch to allow compilation on ppc-macos.  Patch by exg at gentoo dot org
 
 *gpgme-1.1.0 (26 Oct 2005)
 
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 17e659624454..7071ef3fedf9 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,11 +1,36 @@
-MD5 30461cc0601654249f402132f3b8d286 gpgme-1.0.2.ebuild 1901
-MD5 01c6d97b40dda97420a63cb2499101a5 gpgme-0.3.14-r1.ebuild 2436
-MD5 21ce4bf6080f7c567dbc05d5e6b7ab08 gpgme-1.1.0.ebuild 1536
 MD5 50218b79a3f434cffa28f4e00001d62f ChangeLog 12864
-MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
-MD5 c2d5eb24b51350faf76c13725219ddc9 gpgme-1.0.3.ebuild 1527
+RMD160 a959df132f34f09f93d814f9f2b024a442a5382d ChangeLog 12864
+SHA256 be15cd0866e72a40da0127a9dc78b746c9bc86de870bb51d8322fdbf0b18b916 ChangeLog 12864
+MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14-r1 64
+RMD160 7567c2fe0fa51cadab7a612bb49b713fcc012b98 files/digest-gpgme-0.3.14-r1 64
+SHA256 8933c5f50011576f01447e47120a1d30dcc1180060fd04a4066cb580695b27d3 files/digest-gpgme-0.3.14-r1 64
 MD5 4ca60fb78dc0701418130b3f6f18c18f files/digest-gpgme-1.0.2 63
+RMD160 2b846f0d5f27f3747bbc7aadc8037fb4c6e080df files/digest-gpgme-1.0.2 63
+SHA256 785012c555822daa615f78a4334e499abb831a91888c7e72393d4f2bec433e9c files/digest-gpgme-1.0.2 63
 MD5 c7fc60919fd40585f41b90da49e9bf3f files/digest-gpgme-1.0.3 63
-MD5 5ef603604efc88daba083c920ff1c39d files/digest-gpgme-1.1.0 63
-MD5 438d865640f00b860f2c3f88b21e621e files/digest-gpgme-0.3.14-r1 64
+RMD160 38012628b45759c5e230d701f1b85da1a8be905f files/digest-gpgme-1.0.3 63
+SHA256 6311882815d5634520a24819724944375134d6ba6f1a254dca89413d5aa5e8c3 files/digest-gpgme-1.0.3 63
+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 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
 MD5 afc6d9e463f4b389eb085af310f8b74f files/gpgme3.m4.patch 482
+RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc files/gpgme3.m4.patch 482
+SHA256 8e71df251cbbed19cfb2e929c0781adb92b02fb32759349c62408ab108bcc2c3 files/gpgme3.m4.patch 482
+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
+MD5 30461cc0601654249f402132f3b8d286 gpgme-1.0.2.ebuild 1901
+RMD160 6093b17cc31a36d0b6b0e540ff097bda80601d25 gpgme-1.0.2.ebuild 1901
+SHA256 ce38e73f9f6e9c9680e23da153b1f87d2fb753de163d86625dfe45a6ae44a607 gpgme-1.0.2.ebuild 1901
+MD5 c2d5eb24b51350faf76c13725219ddc9 gpgme-1.0.3.ebuild 1527
+RMD160 01eefb27423f186d397c0df783c77dd9f9734f7e gpgme-1.0.3.ebuild 1527
+SHA256 29909b1e0955d7faae165d6d87b9be5071ffcf82c0fa9bf0683603718149a346 gpgme-1.0.3.ebuild 1527
+MD5 3d5791472e6397d3ee3a8177fa39fd6d gpgme-1.1.0.ebuild 1667
+RMD160 d7ec3359340a0b2fd287d8977a1c3a759a5f94c2 gpgme-1.1.0.ebuild 1667
+SHA256 67a40480f3fe41b9d39912336dffb058d4bd26b42dd221b203ee8e58aa282a4f gpgme-1.1.0.ebuild 1667
+MD5 ce0db60fd655ade98789a1643d4fdd9d metadata.xml 314
+RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a metadata.xml 314
+SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649 metadata.xml 314
diff --git a/app-crypt/gpgme/files/digest-gpgme-1.1.0 b/app-crypt/gpgme/files/digest-gpgme-1.1.0
index 0a18fab33c2d..e0986240a9d1 100644
--- a/app-crypt/gpgme/files/digest-gpgme-1.1.0
+++ b/app-crypt/gpgme/files/digest-gpgme-1.1.0
@@ -1 +1,3 @@
 MD5 dc180e1c2b3b13cf3b16b9586e8509ac gpgme-1.1.0.tar.gz 862122
+RMD160 f29903597e74ae637001a73ba9ae4cfd20802bf2 gpgme-1.1.0.tar.gz 862122
+SHA256 a481bc118d8f6f55ef11be0ce3ac9b9834e992ab2381648626add502a910e2a1 gpgme-1.1.0.tar.gz 862122
diff --git a/app-crypt/gpgme/files/gpgme-1.1.0-pth-test.patch b/app-crypt/gpgme/files/gpgme-1.1.0-pth-test.patch
new file mode 100644
index 000000000000..af833a1ede45
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.1.0-pth-test.patch
@@ -0,0 +1,31 @@
+exg@gentoo.org
+* fixes for darwin in configure check for pthread
+
+--- gpgme-1.1.0/m4/pth.m4
++++ gpgme-1.1.0/m4/pth.m4
+@@ -285,8 +285,6 @@
+         #include <pth.h>
+         ])
+         define(_code2, [dnl
+-        int main(int argc, char *argv[])
+-        {
+             FILE *fp;
+             if (!(fp = fopen("conftestval", "w")))
+                 exit(1);
+@@ -299,7 +297,6 @@
+             fprintf(fp, "yes");
+             fclose(fp);
+             exit(0);
+-        }
+         ])
+         _AC_PTH_VERBOSE([+ Performing Sanity Checks:])
+         _AC_PTH_VERBOSE([    o pre-processor test])
+@@ -329,7 +326,7 @@
+             See config.log for possibly more details.])
+         fi
+         _AC_PTH_VERBOSE([    o run-time check])
+-        AC_TRY_RUN(_code1 _code2, _ok=`cat conftestval`, _ok=no, _ok=no)
++        AC_TRY_RUN(AC_LANG_PROGRAM(_code1, _code2), _ok=`cat conftestval`, _ok=no, _ok=no)
+         if test ".$_ok" != .yes; then
+             if test ".$_ok" = .no; then
+                 _AC_PTH_ERROR([dnl
diff --git a/app-crypt/gpgme/gpgme-1.1.0.ebuild b/app-crypt/gpgme/gpgme-1.1.0.ebuild
index bc31617048c1..68853a52caa8 100644
--- a/app-crypt/gpgme/gpgme-1.1.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2005/10/26 14:06:05 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.0.ebuild,v 1.2 2006/02/20 20:30:09 grobian Exp $
 
-inherit eutils libtool
+inherit eutils libtool autotools
 
 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 ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc-macos ~ppc64 ~sparc ~x86"
 IUSE=""
 #IUSE="smime"
 
@@ -31,6 +31,15 @@ RDEPEND="virtual/libc
 	>=app-crypt/gnupg-1.2.2
 	dev-libs/pth"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-pth-test.patch"
+
+	cd ${S}
+	export WANT_AUTOCONF="2.5"
+	eautoconf
+}
+
 src_compile() {
 	if [ -x /usr/bin/gpg2 ]; then
 		GPGBIN=/usr/bin/gpg2