Added a fix for relocation problem on hppa. Removed macos KEYWORDS until they stabilize sys-devel/patch.

4 files changed, 103 insertions, 1 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index ab59bf5b1d8b..ccccf99edc0c 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.37 2004/08/09 18:28:22 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.38 2004/09/04 11:55:29 gmsoft Exp $
+
+*libgcrypt-1.2.0-r1 (04 Sep 2004)
+
+  04 Sep 2004; Guy Martin <gmsoft@gentoo.org> +files/libgcrypt-hppa.patch,
+  +libgcrypt-1.2.0-r1.ebuild:
+  Added a fix for relocation problem on hppa. Removed macos KEYWORDS until they
+  stabilize sys-devel/patch.
 
   09 Aug 2004; Guy Martin <gmsoft@gentoo.org> libgcrypt-1.2.0.ebuild:
   Stable on hppa.
diff --git a/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r1 b/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r1
new file mode 100644
index 000000000000..ff786072fa8f
--- /dev/null
+++ b/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r1
@@ -0,0 +1 @@
+MD5 5c508072d8387ce17d1ab05075c2be40 libgcrypt-1.2.0.tar.gz 949159
diff --git a/dev-libs/libgcrypt/files/libgcrypt-hppa.patch b/dev-libs/libgcrypt/files/libgcrypt-hppa.patch
new file mode 100644
index 000000000000..37b4a1a8d93a
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-hppa.patch
@@ -0,0 +1,52 @@
+--- libgcrypt-1.2.0/mpi/hppa1.1/udiv-qrnnd.S.orig	2004-09-04 10:21:05.719003000 +0200
++++ libgcrypt-1.2.0/mpi/hppa1.1/udiv-qrnnd.S	2004-09-04 10:22:48.089003000 +0200
+@@ -36,11 +36,12 @@
+  *   d		   gr23
+  */
+ 
+-	.code
++	.data
+ 	.align		8
+ 	.label L$0000
+ 	.word		0x43f00000
+ 	.word		0x0
++	.code
+ 	.export 	__udiv_qrnnd
+ 	.label		__udiv_qrnnd
+ 	.proc
+@@ -50,13 +51,14 @@
+ 
+ 	stws		%r25,-16(0,%r30)	; n_hi
+ 	stws		%r24,-12(0,%r30)	; n_lo
+-	ldil		L'L$0000,%r19           ; '
+-	ldo		R'L$0000(%r19),%r19     ; '
++	stw		%r19,-32(%r30)
++	addil		LT%L$0000,%r19
++	ldw		RT%L$0000(%r1),%r1
+ 	fldds		-16(0,%r30),%fr5
+ 	stws		%r23,-12(0,%r30)
+ 	comib,<=	0,%r25,L$1
+ 	fcnvxf,dbl,dbl	%fr5,%fr5
+-	fldds		0(0,%r19),%fr4
++	fldds		0(0,%r1),%fr4
+ 	fadd,dbl	%fr4,%fr5,%fr5
+ 	.label	L$1
+ 	fcpy,sgl	%fr0,%fr6L
+@@ -73,8 +75,8 @@
+ 	ldws		-12(0,%r30),%r21
+ 	ldws		-16(0,%r30),%r20
+ 	sub		%r24,%r21,%r22
+-	subb		%r25,%r20,%r19
+-	comib,= 	0,%r19,L$2
++	subb		%r25,%r20,%r1
++	comib,= 	0,%r1,L$2
+ 	ldo		-64(%r30),%r30
+ 
+ 	add		%r22,%r23,%r22
+@@ -86,4 +88,4 @@
+ 	.exit
+ 	.procend
+ 
+-        
+\ No newline at end of file
++        
diff --git a/dev-libs/libgcrypt/libgcrypt-1.2.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..1ba9601c53c2
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.2.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.0-r1.ebuild,v 1.1 2004/09/04 11:55:29 gmsoft Exp $
+
+inherit eutils
+
+DESCRIPTION="general purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 sparc ~mips ~alpha hppa ia64 ~ppc ppc64"
+IUSE="nls"
+
+DEPEND="dev-libs/libgpg-error"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+
+	unpack ${A}
+	epatch ${FILESDIR}/${PN}-hppa.patch
+
+}
+
+src_compile() {
+	econf $(use_enable nls) --disable-dependency-tracking || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS ChangeLog COPYING* NEWS README* THANKS TODO VERSION
+
+	# backwards compat symlinks
+	if ! use macos
+	then
+		ln -s libgcrypt.so.11 ${D}/usr/lib/libgcrypt.so.7
+		ln -s libgcrypt-pth.so.11 ${D}/usr/lib/libgcrypt-pth.so.7
+		ln -s libgcrypt-pthread.so.11 ${D}/usr/lib/libgcrypt-pthread.so.7
+	fi
+}