diff options
| -rw-r--r-- | app-crypt/gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/gpgme/files/gpgme-1.1.2-fbsd.patch | 41 | ||||
| -rw-r--r-- | app-crypt/gpgme/gpgme-1.1.2-r1.ebuild | 8 |
3 files changed, 51 insertions, 4 deletions
diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog index 98d325d17b30..183dbc4dc284 100644 --- 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/files/gpgme-1.1.2-fbsd.patch b/app-crypt/gpgme/files/gpgme-1.1.2-fbsd.patch new file mode 100644 index 000000000000..564e6ac4cb5a --- /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 655e454e4e71..4e61fd2a4758 100644 --- 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 } |