Version cleanout and fixes bug #96792

Package-Manager: portage-2.0.51.22-r1

13 files changed, 22 insertions, 569 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index daed8afeee71..8f054e98d4f9 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.53 2005/07/03 21:17:11 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.54 2005/07/05 10:42:54 dragonheart Exp $
+
+  05 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/libgcrypt-hppa.patch, -files/libgcrypt-rijndael.patch,
+  -libgcrypt-1.1.91.ebuild, -libgcrypt-1.1.92.ebuild,
+  -libgcrypt-1.2.0-r1.ebuild, -libgcrypt-1.2.0-r2.ebuild,
+  libgcrypt-1.2.1.ebuild:
+  Version cleanout and fixes bug #96792 by Chris White
 
   03 Jul 2005; Hardave Riar <hardave@gentoo.org> libgcrypt-1.2.1.ebuild:
   Stable on mips, dep for bug #90726.
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index e8971daefd76..91f16e7e9cf0 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,20 +1,20 @@
-MD5 708eb46974f66d1e218d36947f649fd4 ChangeLog 7633
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1dbba662c6f8357c95685e3748311085 ChangeLog 7948
 MD5 d7afc8024da44bc7a81cf54e540323f5 libgcrypt-1.1.12.ebuild 1135
-MD5 ad5a9b1b5878019b461d3e468de268d5 libgcrypt-1.1.91.ebuild 777
-MD5 9bdc42d985f158c2b7da92ef568cdcdb libgcrypt-1.1.92.ebuild 988
+MD5 8e07d5006c7ef4ce1d8befd01c7d6647 libgcrypt-1.2.1.ebuild 1047
+MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 MD5 208bae1be4306e0e45edeebf65eaabfb libgcrypt-1.1.94.ebuild 1003
-MD5 6b1c9e02c30b280aa33402f4a6068ea6 libgcrypt-1.2.0-r1.ebuild 1149
-MD5 ec87720f570c69c41120eff0e583c64d libgcrypt-1.2.0-r2.ebuild 1205
 MD5 3b3e797e3cbd4c393d91f4902efb8dfe libgcrypt-1.2.0.ebuild 1061
-MD5 6094253aa1371472caedd8ebac6e5388 libgcrypt-1.2.1.ebuild 1163
-MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 MD5 9bf9811b5db655640e7f280bb9bab24c files/digest-libgcrypt-1.1.12 68
-MD5 eb84241995268ddf928f15c1fc43f5ff files/digest-libgcrypt-1.1.91 68
-MD5 90f8d641fd24175958583ca806913d81 files/digest-libgcrypt-1.1.92 68
 MD5 9f546283fe69d56096f3707d52a4668a files/digest-libgcrypt-1.1.94 68
 MD5 16b1f5ae3cd2e7678379e1c6be616455 files/digest-libgcrypt-1.2.0 67
-MD5 16b1f5ae3cd2e7678379e1c6be616455 files/digest-libgcrypt-1.2.0-r1 67
-MD5 16b1f5ae3cd2e7678379e1c6be616455 files/digest-libgcrypt-1.2.0-r2 67
 MD5 1c871fcf508869ff09d46782655c3ca5 files/digest-libgcrypt-1.2.1 67
-MD5 42e08103310c04095c58c5070ab8690c files/libgcrypt-hppa.patch 1099
-MD5 2b7ce42f9b49ecbeddca76b1edc5699d files/libgcrypt-rijndael.patch 13132
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCymREmdTrptrqvGERAmXkAJ4p8pk3vQYMun32XSVkBi681fzlLACfaWo5
+ZxVLrViiIFLAZiRAQ/+Uj70=
+=aAoZ
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/files/digest-libgcrypt-1.1.91 b/dev-libs/libgcrypt/files/digest-libgcrypt-1.1.91
deleted file mode 100644
index d59b06e6a25e..000000000000
--- a/dev-libs/libgcrypt/files/digest-libgcrypt-1.1.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f3581d2d2a66c8f42b16f6ce13dedc3 libgcrypt-1.1.91.tar.gz 876347
diff --git a/dev-libs/libgcrypt/files/digest-libgcrypt-1.1.92 b/dev-libs/libgcrypt/files/digest-libgcrypt-1.1.92
deleted file mode 100644
index b23a80cad900..000000000000
--- a/dev-libs/libgcrypt/files/digest-libgcrypt-1.1.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0b5a99cde147d2a7e8302c9f8f64ffc libgcrypt-1.1.92.tar.gz 847112
diff --git a/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r1 b/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r1
deleted file mode 100644
index ff786072fa8f..000000000000
--- a/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c508072d8387ce17d1ab05075c2be40 libgcrypt-1.2.0.tar.gz 949159
diff --git a/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r2 b/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r2
deleted file mode 100644
index ff786072fa8f..000000000000
--- a/dev-libs/libgcrypt/files/digest-libgcrypt-1.2.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 37b4a1a8d93a..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-hppa.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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/files/libgcrypt-rijndael.patch b/dev-libs/libgcrypt/files/libgcrypt-rijndael.patch
deleted file mode 100644
index 9ccf150985ba..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-rijndael.patch
+++ /dev/null
@@ -1,352 +0,0 @@
---- libgcrypt-1.2.0/cipher/rijndael.c.orig	2004-10-09 17:13:26.101200938 -0600
-+++ libgcrypt-1.2.0/cipher/rijndael.c	2004-10-09 17:13:32.444236650 -0600
-@@ -48,13 +48,25 @@
- 
- static const char *selftest(void);
- 
--typedef struct {
--    int   ROUNDS;                   /* key-length-dependent number of rounds */
--    int decryption_prepared;
--    byte  keySched[MAXROUNDS+1][4][4];	/* key schedule		*/
--    byte  keySched2[MAXROUNDS+1][4][4];	/* key schedule		*/
-+typedef struct 
-+{
-+  int   ROUNDS;                   /* key-length-dependent number of rounds */
-+  int decryption_prepared;
-+  union 
-+  {
-+    PROPERLY_ALIGNED_TYPE dummy;
-+    byte keyschedule[MAXROUNDS+1][4][4];
-+  } u1;
-+  union
-+  {
-+    PROPERLY_ALIGNED_TYPE dummy;
-+    byte keyschedule[MAXROUNDS+1][4][4];	
-+  } u2;
- } RIJNDAEL_context;
- 
-+#define keySched  u1.keyschedule
-+#define keySched2 u2.keyschedule
-+
- 
- static const byte S[256] = {
-     99, 124, 119, 123, 242, 107, 111, 197,
-@@ -1881,90 +1893,108 @@
- 
- /* Encrypt one block.  A and B may be the same. */
- static void
--do_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a)
-+do_encrypt (const RIJNDAEL_context *ctx, byte *bx, const byte *ax)
- {
-   /* FIXME: Ugly code, replace by straighter implementaion and use
-      optimized assembler for common CPUs. */
- 
-   int r;
--  union {
-+  union
-+  {
-     u32  tempu32[4];  /* Force correct alignment. */
-     byte temp[4][4];
-   } u;
-   int ROUNDS = ctx->ROUNDS;
- #define rk (ctx->keySched)
- 
--  *((u32*)u.temp[0]) = *((u32*)(a   )) ^ *((u32*)rk[0][0]);
--  *((u32*)u.temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[0][1]);
--  *((u32*)u.temp[2]) = *((u32*)(a+ 8)) ^ *((u32*)rk[0][2]);
--  *((u32*)u.temp[3]) = *((u32*)(a+12)) ^ *((u32*)rk[0][3]);
--  *((u32*)(b    )) = (*((u32*)T1[u.temp[0][0]])
-+  /* BX and AX are not necessary correctly aligned.  Thus we need to
-+     copy them here. */
-+  union
-+  {
-+    u32  dummy[4]; 
-+    byte a[16];
-+  } a;
-+  union
-+  {
-+    u32  dummy[4]; 
-+    byte b[16];
-+  } b;
-+
-+  memcpy (a.a, ax, 16);
-+
-+  *((u32*)u.temp[0]) = *((u32*)(a.a   )) ^ *((u32*)rk[0][0]);
-+  *((u32*)u.temp[1]) = *((u32*)(a.a+ 4)) ^ *((u32*)rk[0][1]);
-+  *((u32*)u.temp[2]) = *((u32*)(a.a+ 8)) ^ *((u32*)rk[0][2]);
-+  *((u32*)u.temp[3]) = *((u32*)(a.a+12)) ^ *((u32*)rk[0][3]);
-+  *((u32*)(b.b    )) = (*((u32*)T1[u.temp[0][0]])
-                       ^ *((u32*)T2[u.temp[1][1]])
-                       ^ *((u32*)T3[u.temp[2][2]]) 
-                       ^ *((u32*)T4[u.temp[3][3]]));
--  *((u32*)(b + 4)) = (*((u32*)T1[u.temp[1][0]])
-+  *((u32*)(b.b + 4)) = (*((u32*)T1[u.temp[1][0]])
-                       ^ *((u32*)T2[u.temp[2][1]])
-                       ^ *((u32*)T3[u.temp[3][2]]) 
-                       ^ *((u32*)T4[u.temp[0][3]]));
--  *((u32*)(b + 8)) = (*((u32*)T1[u.temp[2][0]])
-+  *((u32*)(b.b + 8)) = (*((u32*)T1[u.temp[2][0]])
-                       ^ *((u32*)T2[u.temp[3][1]])
-                       ^ *((u32*)T3[u.temp[0][2]]) 
-                       ^ *((u32*)T4[u.temp[1][3]]));
--  *((u32*)(b +12)) = (*((u32*)T1[u.temp[3][0]])
-+  *((u32*)(b.b +12)) = (*((u32*)T1[u.temp[3][0]])
-                       ^ *((u32*)T2[u.temp[0][1]])
-                       ^ *((u32*)T3[u.temp[1][2]]) 
-                       ^ *((u32*)T4[u.temp[2][3]]));
- 
-   for (r = 1; r < ROUNDS-1; r++)
-     {
--      *((u32*)u.temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[r][0]);
--      *((u32*)u.temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[r][1]);
--      *((u32*)u.temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[r][2]);
--      *((u32*)u.temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[r][3]);
-+      *((u32*)u.temp[0]) = *((u32*)(b.b   )) ^ *((u32*)rk[r][0]);
-+      *((u32*)u.temp[1]) = *((u32*)(b.b+ 4)) ^ *((u32*)rk[r][1]);
-+      *((u32*)u.temp[2]) = *((u32*)(b.b+ 8)) ^ *((u32*)rk[r][2]);
-+      *((u32*)u.temp[3]) = *((u32*)(b.b+12)) ^ *((u32*)rk[r][3]);
- 
--      *((u32*)(b    )) = (*((u32*)T1[u.temp[0][0]])
-+      *((u32*)(b.b    )) = (*((u32*)T1[u.temp[0][0]])
-                           ^ *((u32*)T2[u.temp[1][1]])
-                           ^ *((u32*)T3[u.temp[2][2]]) 
-                           ^ *((u32*)T4[u.temp[3][3]]));
--      *((u32*)(b + 4)) = (*((u32*)T1[u.temp[1][0]])
-+      *((u32*)(b.b + 4)) = (*((u32*)T1[u.temp[1][0]])
-                           ^ *((u32*)T2[u.temp[2][1]])
-                           ^ *((u32*)T3[u.temp[3][2]]) 
-                           ^ *((u32*)T4[u.temp[0][3]]));
--      *((u32*)(b + 8)) = (*((u32*)T1[u.temp[2][0]])
-+      *((u32*)(b.b + 8)) = (*((u32*)T1[u.temp[2][0]])
-                           ^ *((u32*)T2[u.temp[3][1]])
-                           ^ *((u32*)T3[u.temp[0][2]]) 
-                           ^ *((u32*)T4[u.temp[1][3]]));
--      *((u32*)(b +12)) = (*((u32*)T1[u.temp[3][0]])
-+      *((u32*)(b.b +12)) = (*((u32*)T1[u.temp[3][0]])
-                           ^ *((u32*)T2[u.temp[0][1]])
-                           ^ *((u32*)T3[u.temp[1][2]]) 
-                           ^ *((u32*)T4[u.temp[2][3]]));
-     }
- 
-   /* Last round is special. */   
--  *((u32*)u.temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[ROUNDS-1][0]);
--  *((u32*)u.temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[ROUNDS-1][1]);
--  *((u32*)u.temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[ROUNDS-1][2]);
--  *((u32*)u.temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[ROUNDS-1][3]);
--  b[ 0] = T1[u.temp[0][0]][1];
--  b[ 1] = T1[u.temp[1][1]][1];
--  b[ 2] = T1[u.temp[2][2]][1];
--  b[ 3] = T1[u.temp[3][3]][1];
--  b[ 4] = T1[u.temp[1][0]][1];
--  b[ 5] = T1[u.temp[2][1]][1];
--  b[ 6] = T1[u.temp[3][2]][1];
--  b[ 7] = T1[u.temp[0][3]][1];
--  b[ 8] = T1[u.temp[2][0]][1];
--  b[ 9] = T1[u.temp[3][1]][1];
--  b[10] = T1[u.temp[0][2]][1];
--  b[11] = T1[u.temp[1][3]][1];
--  b[12] = T1[u.temp[3][0]][1];
--  b[13] = T1[u.temp[0][1]][1];
--  b[14] = T1[u.temp[1][2]][1];
--  b[15] = T1[u.temp[2][3]][1];
--  *((u32*)(b   )) ^= *((u32*)rk[ROUNDS][0]);
--  *((u32*)(b+ 4)) ^= *((u32*)rk[ROUNDS][1]);
--  *((u32*)(b+ 8)) ^= *((u32*)rk[ROUNDS][2]);
--  *((u32*)(b+12)) ^= *((u32*)rk[ROUNDS][3]);
-+  *((u32*)u.temp[0]) = *((u32*)(b.b   )) ^ *((u32*)rk[ROUNDS-1][0]);
-+  *((u32*)u.temp[1]) = *((u32*)(b.b+ 4)) ^ *((u32*)rk[ROUNDS-1][1]);
-+  *((u32*)u.temp[2]) = *((u32*)(b.b+ 8)) ^ *((u32*)rk[ROUNDS-1][2]);
-+  *((u32*)u.temp[3]) = *((u32*)(b.b+12)) ^ *((u32*)rk[ROUNDS-1][3]);
-+  b.b[ 0] = T1[u.temp[0][0]][1];
-+  b.b[ 1] = T1[u.temp[1][1]][1];
-+  b.b[ 2] = T1[u.temp[2][2]][1];
-+  b.b[ 3] = T1[u.temp[3][3]][1];
-+  b.b[ 4] = T1[u.temp[1][0]][1];
-+  b.b[ 5] = T1[u.temp[2][1]][1];
-+  b.b[ 6] = T1[u.temp[3][2]][1];
-+  b.b[ 7] = T1[u.temp[0][3]][1];
-+  b.b[ 8] = T1[u.temp[2][0]][1];
-+  b.b[ 9] = T1[u.temp[3][1]][1];
-+  b.b[10] = T1[u.temp[0][2]][1];
-+  b.b[11] = T1[u.temp[1][3]][1];
-+  b.b[12] = T1[u.temp[3][0]][1];
-+  b.b[13] = T1[u.temp[0][1]][1];
-+  b.b[14] = T1[u.temp[1][2]][1];
-+  b.b[15] = T1[u.temp[2][3]][1];
-+  *((u32*)(b.b   )) ^= *((u32*)rk[ROUNDS][0]);
-+  *((u32*)(b.b+ 4)) ^= *((u32*)rk[ROUNDS][1]);
-+  *((u32*)(b.b+ 8)) ^= *((u32*)rk[ROUNDS][2]);
-+  *((u32*)(b.b+12)) ^= *((u32*)rk[ROUNDS][3]);
-+
-+  memcpy (bx, b.b, 16);
- #undef rk
- }
- 
-@@ -1974,14 +2004,14 @@
-   RIJNDAEL_context *ctx = context;
- 
-   do_encrypt (ctx, b, a);
--  _gcry_burn_stack (16 + 2*sizeof(int));
-+  _gcry_burn_stack (48 + 2*sizeof(int));
- }
- 
- 
- 
- /* Decrypt one block.  a and b may be the same. */
- static void
--do_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a)
-+do_decrypt (RIJNDAEL_context *ctx, byte *bx, const byte *ax)
- {
- #define rk  (ctx->keySched2)
-   int ROUNDS = ctx->ROUNDS; 
-@@ -1991,6 +2021,21 @@
-     byte temp[4][4];
-   } u;
- 
-+  /* BX and AX are not necessary correctly aligned.  Thus we need to
-+     copy them here. */
-+  union
-+  {
-+    u32  dummy[4]; 
-+    byte a[16];
-+  } a;
-+  union
-+  {
-+    u32  dummy[4]; 
-+    byte b[16];
-+  } b;
-+
-+  memcpy (a.a, ax, 16);
-+
-   if ( !ctx->decryption_prepared )
-     {
-       prepare_decryption ( ctx );
-@@ -1998,77 +2043,79 @@
-       ctx->decryption_prepared = 1;
-     }
-     
--  *((u32*)u.temp[0]) = *((u32*)(a   )) ^ *((u32*)rk[ROUNDS][0]);
--  *((u32*)u.temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[ROUNDS][1]);
--  *((u32*)u.temp[2]) = *((u32*)(a+ 8)) ^ *((u32*)rk[ROUNDS][2]);
--  *((u32*)u.temp[3]) = *((u32*)(a+12)) ^ *((u32*)rk[ROUNDS][3]);
-+  *((u32*)u.temp[0]) = *((u32*)(a.a   )) ^ *((u32*)rk[ROUNDS][0]);
-+  *((u32*)u.temp[1]) = *((u32*)(a.a+ 4)) ^ *((u32*)rk[ROUNDS][1]);
-+  *((u32*)u.temp[2]) = *((u32*)(a.a+ 8)) ^ *((u32*)rk[ROUNDS][2]);
-+  *((u32*)u.temp[3]) = *((u32*)(a.a+12)) ^ *((u32*)rk[ROUNDS][3]);
-   
--  *((u32*)(b   )) = (*((u32*)T5[u.temp[0][0]])
-+  *((u32*)(b.b   )) = (*((u32*)T5[u.temp[0][0]])
-                      ^ *((u32*)T6[u.temp[3][1]])
-                      ^ *((u32*)T7[u.temp[2][2]]) 
-                      ^ *((u32*)T8[u.temp[1][3]]));
--  *((u32*)(b+ 4)) = (*((u32*)T5[u.temp[1][0]])
-+  *((u32*)(b.b+ 4)) = (*((u32*)T5[u.temp[1][0]])
-                      ^ *((u32*)T6[u.temp[0][1]])
-                      ^ *((u32*)T7[u.temp[3][2]]) 
-                      ^ *((u32*)T8[u.temp[2][3]]));
--  *((u32*)(b+ 8)) = (*((u32*)T5[u.temp[2][0]])
-+  *((u32*)(b.b+ 8)) = (*((u32*)T5[u.temp[2][0]])
-                      ^ *((u32*)T6[u.temp[1][1]])
-                      ^ *((u32*)T7[u.temp[0][2]]) 
-                      ^ *((u32*)T8[u.temp[3][3]]));
--  *((u32*)(b+12)) = (*((u32*)T5[u.temp[3][0]])
-+  *((u32*)(b.b+12)) = (*((u32*)T5[u.temp[3][0]])
-                      ^ *((u32*)T6[u.temp[2][1]])
-                      ^ *((u32*)T7[u.temp[1][2]]) 
-                      ^ *((u32*)T8[u.temp[0][3]]));
- 
-   for (r = ROUNDS-1; r > 1; r--)
-     {
--      *((u32*)u.temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[r][0]);
--      *((u32*)u.temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[r][1]);
--      *((u32*)u.temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[r][2]);
--      *((u32*)u.temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[r][3]);
--      *((u32*)(b   )) = (*((u32*)T5[u.temp[0][0]])
-+      *((u32*)u.temp[0]) = *((u32*)(b.b   )) ^ *((u32*)rk[r][0]);
-+      *((u32*)u.temp[1]) = *((u32*)(b.b+ 4)) ^ *((u32*)rk[r][1]);
-+      *((u32*)u.temp[2]) = *((u32*)(b.b+ 8)) ^ *((u32*)rk[r][2]);
-+      *((u32*)u.temp[3]) = *((u32*)(b.b+12)) ^ *((u32*)rk[r][3]);
-+      *((u32*)(b.b   )) = (*((u32*)T5[u.temp[0][0]])
-                          ^ *((u32*)T6[u.temp[3][1]])
-                          ^ *((u32*)T7[u.temp[2][2]]) 
-                          ^ *((u32*)T8[u.temp[1][3]]));
--      *((u32*)(b+ 4)) = (*((u32*)T5[u.temp[1][0]])
-+      *((u32*)(b.b+ 4)) = (*((u32*)T5[u.temp[1][0]])
-                          ^ *((u32*)T6[u.temp[0][1]])
-                          ^ *((u32*)T7[u.temp[3][2]]) 
-                          ^ *((u32*)T8[u.temp[2][3]]));
--      *((u32*)(b+ 8)) = (*((u32*)T5[u.temp[2][0]])
-+      *((u32*)(b.b+ 8)) = (*((u32*)T5[u.temp[2][0]])
-                          ^ *((u32*)T6[u.temp[1][1]])
-                          ^ *((u32*)T7[u.temp[0][2]]) 
-                          ^ *((u32*)T8[u.temp[3][3]]));
--      *((u32*)(b+12)) = (*((u32*)T5[u.temp[3][0]])
-+      *((u32*)(b.b+12)) = (*((u32*)T5[u.temp[3][0]])
-                          ^ *((u32*)T6[u.temp[2][1]])
-                          ^ *((u32*)T7[u.temp[1][2]]) 
-                          ^ *((u32*)T8[u.temp[0][3]]));
-     }
- 
-   /* Last round is special. */   
--  *((u32*)u.temp[0]) = *((u32*)(b   )) ^ *((u32*)rk[1][0]);
--  *((u32*)u.temp[1]) = *((u32*)(b+ 4)) ^ *((u32*)rk[1][1]);
--  *((u32*)u.temp[2]) = *((u32*)(b+ 8)) ^ *((u32*)rk[1][2]);
--  *((u32*)u.temp[3]) = *((u32*)(b+12)) ^ *((u32*)rk[1][3]);
--  b[ 0] = S5[u.temp[0][0]];
--  b[ 1] = S5[u.temp[3][1]];
--  b[ 2] = S5[u.temp[2][2]];
--  b[ 3] = S5[u.temp[1][3]];
--  b[ 4] = S5[u.temp[1][0]];
--  b[ 5] = S5[u.temp[0][1]];
--  b[ 6] = S5[u.temp[3][2]];
--  b[ 7] = S5[u.temp[2][3]];
--  b[ 8] = S5[u.temp[2][0]];
--  b[ 9] = S5[u.temp[1][1]];
--  b[10] = S5[u.temp[0][2]];
--  b[11] = S5[u.temp[3][3]];
--  b[12] = S5[u.temp[3][0]];
--  b[13] = S5[u.temp[2][1]];
--  b[14] = S5[u.temp[1][2]];
--  b[15] = S5[u.temp[0][3]];
--  *((u32*)(b   )) ^= *((u32*)rk[0][0]);
--  *((u32*)(b+ 4)) ^= *((u32*)rk[0][1]);
--  *((u32*)(b+ 8)) ^= *((u32*)rk[0][2]);
--  *((u32*)(b+12)) ^= *((u32*)rk[0][3]);
-+  *((u32*)u.temp[0]) = *((u32*)(b.b   )) ^ *((u32*)rk[1][0]);
-+  *((u32*)u.temp[1]) = *((u32*)(b.b+ 4)) ^ *((u32*)rk[1][1]);
-+  *((u32*)u.temp[2]) = *((u32*)(b.b+ 8)) ^ *((u32*)rk[1][2]);
-+  *((u32*)u.temp[3]) = *((u32*)(b.b+12)) ^ *((u32*)rk[1][3]);
-+  b.b[ 0] = S5[u.temp[0][0]];
-+  b.b[ 1] = S5[u.temp[3][1]];
-+  b.b[ 2] = S5[u.temp[2][2]];
-+  b.b[ 3] = S5[u.temp[1][3]];
-+  b.b[ 4] = S5[u.temp[1][0]];
-+  b.b[ 5] = S5[u.temp[0][1]];
-+  b.b[ 6] = S5[u.temp[3][2]];
-+  b.b[ 7] = S5[u.temp[2][3]];
-+  b.b[ 8] = S5[u.temp[2][0]];
-+  b.b[ 9] = S5[u.temp[1][1]];
-+  b.b[10] = S5[u.temp[0][2]];
-+  b.b[11] = S5[u.temp[3][3]];
-+  b.b[12] = S5[u.temp[3][0]];
-+  b.b[13] = S5[u.temp[2][1]];
-+  b.b[14] = S5[u.temp[1][2]];
-+  b.b[15] = S5[u.temp[0][3]];
-+  *((u32*)(b.b   )) ^= *((u32*)rk[0][0]);
-+  *((u32*)(b.b+ 4)) ^= *((u32*)rk[0][1]);
-+  *((u32*)(b.b+ 8)) ^= *((u32*)rk[0][2]);
-+  *((u32*)(b.b+12)) ^= *((u32*)rk[0][3]);
-+
-+  memcpy (bx, b.b, 16);
- #undef rk
- }
- 
-@@ -2078,7 +2125,7 @@
-   RIJNDAEL_context *ctx = context;
- 
-   do_decrypt (ctx, b, a);
--  _gcry_burn_stack (16+2*sizeof(int));
-+  _gcry_burn_stack (48+2*sizeof(int));
- }
- 
- 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.1.91.ebuild b/dev-libs/libgcrypt/libgcrypt-1.1.91.ebuild
deleted file mode 100644
index 7695b888e0a7..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.1.91.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.1.91.ebuild,v 1.9 2005/03/26 20:54:25 vanquirius Exp $
-
-DESCRIPTION="general purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc amd64"
-IUSE="nls"
-
-DEPEND="dev-libs/libgpg-error"
-RDEPEND="nls? ( sys-devel/gettext )
-	dev-libs/libgpg-error"
-
-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
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.1.92.ebuild b/dev-libs/libgcrypt/libgcrypt-1.1.92.ebuild
deleted file mode 100644
index 441bc612afc1..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.1.92.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.1.92.ebuild,v 1.7 2005/03/26 20:54:25 vanquirius Exp $
-
-DESCRIPTION="general purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ~sparc"
-IUSE="nls"
-
-DEPEND="dev-libs/libgpg-error"
-RDEPEND="nls? ( sys-devel/gettext )
-	dev-libs/libgpg-error"
-
-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
-	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
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.2.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.2.0-r1.ebuild
deleted file mode 100644
index c1d577884ce2..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 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.6 2005/03/26 20:54:25 vanquirius 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="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ppc64 ~ppc-macos s390 sparc ~x86"
-IUSE="nls"
-
-DEPEND="dev-libs/libgpg-error"
-RDEPEND="nls? ( sys-devel/gettext )
-	dev-libs/libgpg-error"
-
-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 ppc-macos
-	then
-		dosym libgcrypt.so.11 /usr/lib/libgcrypt.so.7
-		dosym libgcrypt-pth.so.11 /usr/lib/libgcrypt-pth.so.7
-		dosym libgcrypt-pthread.so.11 /usr/lib/libgcrypt-pthread.so.7
-	fi
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.2.0-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.2.0-r2.ebuild
deleted file mode 100644
index 561fb34905d0..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 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-r2.ebuild,v 1.7 2005/04/01 04:34:25 agriffis 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="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 sparc ~x86"
-IUSE="nls"
-
-DEPEND="dev-libs/libgpg-error"
-RDEPEND="nls? ( sys-devel/gettext )
-	dev-libs/libgpg-error"
-
-src_unpack() {
-
-	unpack ${A}
-	epatch ${FILESDIR}/${PN}-hppa.patch
-	use sparc && epatch ${FILESDIR}/${PN}-rijndael.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 ppc-macos
-	then
-		dosym libgcrypt.so.11 /usr/lib/libgcrypt.so.7
-		dosym libgcrypt-pth.so.11 /usr/lib/libgcrypt-pth.so.7
-		dosym libgcrypt-pthread.so.11 /usr/lib/libgcrypt-pthread.so.7
-	fi
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild
index d2442d4a7568..2c601c285eed 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild,v 1.13 2005/07/03 21:17:11 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.1.ebuild,v 1.14 2005/07/05 10:42:54 dragonheart Exp $
 
 inherit eutils
 
@@ -36,7 +36,5 @@ src_install() {
 		dosym libgcrypt.11.dylib /usr/lib/libgcrypt.7.dylib
 	else
 		dosym libgcrypt.so.11 /usr/lib/libgcrypt.so.7
-		dosym libgcrypt-pth.so.11 /usr/lib/libgcrypt-pth.so.7
-		dosym libgcrypt-pthread.so.11 /usr/lib/libgcrypt-pthread.so.7
 	fi
 }