Cleanup

Package-Manager: portage-2.1.3.19

15 files changed, 12 insertions, 620 deletions

diff --git a/dev-libs/nettle/ChangeLog b/dev-libs/nettle/ChangeLog
index 96f94aecbe34..99b61dc29711 100644
--- a/dev-libs/nettle/ChangeLog
+++ b/dev-libs/nettle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nettle
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.20 2007/11/14 20:18:24 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/ChangeLog,v 1.21 2007/11/14 20:34:07 alonbl Exp $
+
+  14 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/nettle-1.13-PIC.patch, -files/nettle-1.13-no-exec-stack.patch,
+  -files/nettle-1.13-preprocess-asm.patch, -nettle-1.10.ebuild,
+  -nettle-1.12.ebuild, -nettle-1.13.ebuild, -nettle-1.13-r1.ebuild,
+  -nettle-1.14.ebuild:
+  Cleanup
 
   14 Nov 2007; Markus Ullmann <jokey@gentoo.org> nettle-1.15.ebuild:
   Stable on sparc wrt bug #198689
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index a0aecab028e9..2469090c762f 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,81 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX nettle-1.13-PIC.patch 6732 RMD160 a3e078b11861381467fac596142316f4c11ef031 SHA1 0c628742ae47261143f24b5c52aa282f61c33d89 SHA256 cf4645e02d04623ea5bf0586dc7be439a538484a0ca7d217cc1810b552d9ecb2
-MD5 b28d8f2bb39fc707d82a13413e6cd2c7 files/nettle-1.13-PIC.patch 6732
-RMD160 a3e078b11861381467fac596142316f4c11ef031 files/nettle-1.13-PIC.patch 6732
-SHA256 cf4645e02d04623ea5bf0586dc7be439a538484a0ca7d217cc1810b552d9ecb2 files/nettle-1.13-PIC.patch 6732
-AUX nettle-1.13-no-exec-stack.patch 1424 RMD160 63fcf3e3ed796cf3e321f18a19846006ec370692 SHA1 ab19ca8f4578561da6e569641c6333209a7dab7d SHA256 ab4826e38ec01e9e65c054bf4d3cd429f888e31cc3494d1fe51d9545609c7d0a
-MD5 1d2804d36016baa2bb798ddf87d6e960 files/nettle-1.13-no-exec-stack.patch 1424
-RMD160 63fcf3e3ed796cf3e321f18a19846006ec370692 files/nettle-1.13-no-exec-stack.patch 1424
-SHA256 ab4826e38ec01e9e65c054bf4d3cd429f888e31cc3494d1fe51d9545609c7d0a files/nettle-1.13-no-exec-stack.patch 1424
-AUX nettle-1.13-preprocess-asm.patch 668 RMD160 6040507826c789c53ef767334a51e2abbcbef283 SHA1 0b25d65c93a542b7fb9bfdea040f8f2fe1a1d5ef SHA256 cbaf82371d228012480bd30e0c053a949a2d3860c7fb36e3784f34828525cea7
-MD5 007f00412ae9a343601ec9f3ff7c1da3 files/nettle-1.13-preprocess-asm.patch 668
-RMD160 6040507826c789c53ef767334a51e2abbcbef283 files/nettle-1.13-preprocess-asm.patch 668
-SHA256 cbaf82371d228012480bd30e0c053a949a2d3860c7fb36e3784f34828525cea7 files/nettle-1.13-preprocess-asm.patch 668
 AUX nettle-1.14-make-as-needed.patch 471 RMD160 a81f9d7337c99e8c8c86b6f60cf5d94693e67886 SHA1 43256f88cfc0db51012cde89882a92956c65f36b SHA256 f8552cde7b7c91923c276afca147e9c37b851b60896e1c9d5eb729ecd5bbc324
 MD5 3152670f460267d6de5a69dcc035118a files/nettle-1.14-make-as-needed.patch 471
 RMD160 a81f9d7337c99e8c8c86b6f60cf5d94693e67886 files/nettle-1.14-make-as-needed.patch 471
 SHA256 f8552cde7b7c91923c276afca147e9c37b851b60896e1c9d5eb729ecd5bbc324 files/nettle-1.14-make-as-needed.patch 471
-DIST nettle-1.10.tar.gz 563284 RMD160 89891cbbd68394435a6b957225f6bf37d8299a63 SHA1 a24224f8e02f8f237fef335623a9e0d7b6fbc018 SHA256 3f15c5181eee10e681485df0721e3a160d222fb9acbee127023a6ce8e7e71d1f
-DIST nettle-1.12.tar.gz 536249 RMD160 349c8f4495e3363bf47df66efa729b530bf665ea SHA1 cf7a73d73ccc2cc206c02ca55870ea5e02b8d311 SHA256 c0fd8e1d8f9b17bd74dcd54b98332e5c3bf287281b33afff87740bad41659df4
-DIST nettle-1.13.tar.gz 775548 RMD160 684492141616f34ea7473e6e75c7eef96698070b SHA1 e78393c79c9a9a853637c0c4a350db999920e4e3 SHA256 4e55ed76cfa6cdff782726e343cc758009503c3f50e49ef21f1faff9aee61b31
-DIST nettle-1.14.tar.gz 793931 RMD160 89edf8cdfcc3c8b10a5d9554d001e96175afbf28 SHA1 d802d3b184765b579d33329941cf3eef043f7b17 SHA256 3d26afccc25ce4bd0ac94e12cd6eb3d1023a431cd12ceaad0586d984ed6ea4b2
 DIST nettle-1.15.tar.gz 829862 RMD160 8944901d4a856bb25b8e44e420ba4475c0fd0a93 SHA1 0f2d95a859fc64ff3e490f9f2bec0d206ae95a7e SHA256 d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac
-EBUILD nettle-1.10.ebuild 790 RMD160 343b68731409d26a71bbddd082960c1585940ae2 SHA1 d123d1839f19751d3084e66c3a8e3328435b85cd SHA256 462bd18bff59d2637f23f92ad872eafdb91012fd87cac0a0d7a8c414788a9002
-MD5 a38b72778bd7b5bad7ccbe2cb7f5b90d nettle-1.10.ebuild 790
-RMD160 343b68731409d26a71bbddd082960c1585940ae2 nettle-1.10.ebuild 790
-SHA256 462bd18bff59d2637f23f92ad872eafdb91012fd87cac0a0d7a8c414788a9002 nettle-1.10.ebuild 790
-EBUILD nettle-1.12.ebuild 702 RMD160 d99a81df8bf730f4fa9025e50271fb729ad286d6 SHA1 a3900f0a99fc407f78cfa85d8789d9170cf99681 SHA256 f79540b7130e0ca975167565245f939ab3c2dbbd2525a30a895f194559c83dfd
-MD5 95cd9f104d06cd0b40d2159147f173b9 nettle-1.12.ebuild 702
-RMD160 d99a81df8bf730f4fa9025e50271fb729ad286d6 nettle-1.12.ebuild 702
-SHA256 f79540b7130e0ca975167565245f939ab3c2dbbd2525a30a895f194559c83dfd nettle-1.12.ebuild 702
-EBUILD nettle-1.13-r1.ebuild 1079 RMD160 83675384a3f5a387ad7c2db38624ffae27b6ecd7 SHA1 8378f686c6dae3719bdd5bf44ee5b109769edbc6 SHA256 f1f1f5a272067954d4b3e623bf3ebc6a2ff347a545d35eb920b33a10589a7c97
-MD5 47a2195d8345fde87b659fc87e0e7dc2 nettle-1.13-r1.ebuild 1079
-RMD160 83675384a3f5a387ad7c2db38624ffae27b6ecd7 nettle-1.13-r1.ebuild 1079
-SHA256 f1f1f5a272067954d4b3e623bf3ebc6a2ff347a545d35eb920b33a10589a7c97 nettle-1.13-r1.ebuild 1079
-EBUILD nettle-1.13.ebuild 789 RMD160 f1c3545c9812c8c7bcec5c8b24f3018929a5e655 SHA1 b68b4362654ba3ed8b682b8013c39d4797f21a3d SHA256 101926488b49e3699da45cd308dfea416c3a156f4f27ea07fb29f426099ac5d4
-MD5 64bb5295b5784e2811e229da8d66a2e5 nettle-1.13.ebuild 789
-RMD160 f1c3545c9812c8c7bcec5c8b24f3018929a5e655 nettle-1.13.ebuild 789
-SHA256 101926488b49e3699da45cd308dfea416c3a156f4f27ea07fb29f426099ac5d4 nettle-1.13.ebuild 789
-EBUILD nettle-1.14.ebuild 1028 RMD160 1c59e2b2e61ba08519b2f8e2d646b4081d648bea SHA1 1b64172e49ae655cce662f603c149c2caf747b9c SHA256 3ecb71f402e2d3c830f4ce8630e44bc06bba9f2d38185ef6e430d968fec8b4d1
-MD5 9026d939977a84ee9783562be04aac6a nettle-1.14.ebuild 1028
-RMD160 1c59e2b2e61ba08519b2f8e2d646b4081d648bea nettle-1.14.ebuild 1028
-SHA256 3ecb71f402e2d3c830f4ce8630e44bc06bba9f2d38185ef6e430d968fec8b4d1 nettle-1.14.ebuild 1028
 EBUILD nettle-1.15.ebuild 1026 RMD160 52a111d431801afab272ed0b846d3e9f7f367a18 SHA1 1d447145dd28ccedac9471bfc0c01585d5518f5a SHA256 4faee1900d96bb43daced3bb770bc3cc6da14ce8ed6d98d4af0a13268ca97e7c
 MD5 33b4b263ff7ce70a463366692c43a834 nettle-1.15.ebuild 1026
 RMD160 52a111d431801afab272ed0b846d3e9f7f367a18 nettle-1.15.ebuild 1026
 SHA256 4faee1900d96bb43daced3bb770bc3cc6da14ce8ed6d98d4af0a13268ca97e7c nettle-1.15.ebuild 1026
-MISC ChangeLog 2643 RMD160 c84e7231c935900924d255162d590e82d0bb26b0 SHA1 d8e5016aac6191df67bad72b090c6056e61b2bcb SHA256 17ef4afedabd31695afb78ed809dead5def45fc9796b31ec7080cc0b045a764f
-MD5 3de1f9bd0eee6af30373ffd6eb910cb4 ChangeLog 2643
-RMD160 c84e7231c935900924d255162d590e82d0bb26b0 ChangeLog 2643
-SHA256 17ef4afedabd31695afb78ed809dead5def45fc9796b31ec7080cc0b045a764f ChangeLog 2643
+MISC ChangeLog 2930 RMD160 22b248ef48cacdf18f0a70b2ecd1c387eeab53e9 SHA1 35f4a5bbe1120e4f84ec47c164556801f31e51c7 SHA256 fd7bfc599902a589a44d1c074f5f5d86395515a16ec8b032287362bff9750416
+MD5 e37ee444748521697c4c562b241281e5 ChangeLog 2930
+RMD160 22b248ef48cacdf18f0a70b2ecd1c387eeab53e9 ChangeLog 2930
+SHA256 fd7bfc599902a589a44d1c074f5f5d86395515a16ec8b032287362bff9750416 ChangeLog 2930
 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
 MD5 243e4cd9809545d12f991b2d417040e1 metadata.xml 159
 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 metadata.xml 159
 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 metadata.xml 159
-MD5 b589d80800f75a1792c20c0b7930fc4a files/digest-nettle-1.10 235
-RMD160 3412763194861df27ac071f622e6207f4f3b2136 files/digest-nettle-1.10 235
-SHA256 019b4b608eb07c330362b67bff4695ebfffe4a8cf68b83caad9bf7faa15751a3 files/digest-nettle-1.10 235
-MD5 b9760755870381b568a2f38553c11fed files/digest-nettle-1.12 235
-RMD160 233586cde8d3039cd61d116b5ae91ebede79b3d4 files/digest-nettle-1.12 235
-SHA256 1a4f1538af9fac2bcef422e6c1366dc32f4c5965892655ba9230a2e37b030a92 files/digest-nettle-1.12 235
-MD5 cde6dcc12b0db70d817cad94197aa6fa files/digest-nettle-1.13 235
-RMD160 9a5cecb31c3534159a267d126b51546b0be7d2a6 files/digest-nettle-1.13 235
-SHA256 c88f85a559e6de68dd030c3ed5e6503651097d2902961f2ffc0741590f52abcc files/digest-nettle-1.13 235
-MD5 cde6dcc12b0db70d817cad94197aa6fa files/digest-nettle-1.13-r1 235
-RMD160 9a5cecb31c3534159a267d126b51546b0be7d2a6 files/digest-nettle-1.13-r1 235
-SHA256 c88f85a559e6de68dd030c3ed5e6503651097d2902961f2ffc0741590f52abcc files/digest-nettle-1.13-r1 235
-MD5 523bc025298284a53e78b25ffe86b128 files/digest-nettle-1.14 235
-RMD160 3d8177d10669d85fe2d07394587d7b496db88e31 files/digest-nettle-1.14 235
-SHA256 647e0bc9cb509e3be90e16201d8f7740f338469afbab9732b598b9c54a0e3faf files/digest-nettle-1.14 235
 MD5 db4727dd5b5cf26f78875872d0e56943 files/digest-nettle-1.15 235
 RMD160 f30d7a5ff85e5fad17b6b99c6251aa839e30857d files/digest-nettle-1.15 235
 SHA256 c6dc19cba6bfa27ec8732235e590768067d58615a77cfb7b59cdb919b19c379e files/digest-nettle-1.15 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHO1gWz974XjDVpbkRAsdUAJ9VgrwzswFp5Mwa8oYHovnPr7cxYACfQqo2
-17NA8WgxT07yH+ndqiRUTPk=
-=JdbI
------END PGP SIGNATURE-----
diff --git a/dev-libs/nettle/files/digest-nettle-1.10 b/dev-libs/nettle/files/digest-nettle-1.10
deleted file mode 100644
index 91b334c6a79e..000000000000
--- a/dev-libs/nettle/files/digest-nettle-1.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4a29d2b254e661b6469dc510c02e9f02 nettle-1.10.tar.gz 563284
-RMD160 89891cbbd68394435a6b957225f6bf37d8299a63 nettle-1.10.tar.gz 563284
-SHA256 3f15c5181eee10e681485df0721e3a160d222fb9acbee127023a6ce8e7e71d1f nettle-1.10.tar.gz 563284
diff --git a/dev-libs/nettle/files/digest-nettle-1.12 b/dev-libs/nettle/files/digest-nettle-1.12
deleted file mode 100644
index 259454f1412e..000000000000
--- a/dev-libs/nettle/files/digest-nettle-1.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0bda9389409e48462cd8357b80a55a4f nettle-1.12.tar.gz 536249
-RMD160 349c8f4495e3363bf47df66efa729b530bf665ea nettle-1.12.tar.gz 536249
-SHA256 c0fd8e1d8f9b17bd74dcd54b98332e5c3bf287281b33afff87740bad41659df4 nettle-1.12.tar.gz 536249
diff --git a/dev-libs/nettle/files/digest-nettle-1.13 b/dev-libs/nettle/files/digest-nettle-1.13
deleted file mode 100644
index b1bda45ad872..000000000000
--- a/dev-libs/nettle/files/digest-nettle-1.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e22612a0d7ac01064bf948a7d57f19a nettle-1.13.tar.gz 775548
-RMD160 684492141616f34ea7473e6e75c7eef96698070b nettle-1.13.tar.gz 775548
-SHA256 4e55ed76cfa6cdff782726e343cc758009503c3f50e49ef21f1faff9aee61b31 nettle-1.13.tar.gz 775548
diff --git a/dev-libs/nettle/files/digest-nettle-1.13-r1 b/dev-libs/nettle/files/digest-nettle-1.13-r1
deleted file mode 100644
index b1bda45ad872..000000000000
--- a/dev-libs/nettle/files/digest-nettle-1.13-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e22612a0d7ac01064bf948a7d57f19a nettle-1.13.tar.gz 775548
-RMD160 684492141616f34ea7473e6e75c7eef96698070b nettle-1.13.tar.gz 775548
-SHA256 4e55ed76cfa6cdff782726e343cc758009503c3f50e49ef21f1faff9aee61b31 nettle-1.13.tar.gz 775548
diff --git a/dev-libs/nettle/files/digest-nettle-1.14 b/dev-libs/nettle/files/digest-nettle-1.14
deleted file mode 100644
index c277cd468b0b..000000000000
--- a/dev-libs/nettle/files/digest-nettle-1.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12915b53e751456689e2ec9ec15c74da nettle-1.14.tar.gz 793931
-RMD160 89edf8cdfcc3c8b10a5d9554d001e96175afbf28 nettle-1.14.tar.gz 793931
-SHA256 3d26afccc25ce4bd0ac94e12cd6eb3d1023a431cd12ceaad0586d984ed6ea4b2 nettle-1.14.tar.gz 793931
diff --git a/dev-libs/nettle/files/nettle-1.13-PIC.patch b/dev-libs/nettle/files/nettle-1.13-PIC.patch
deleted file mode 100644
index 0ec47b28607b..000000000000
--- a/dev-libs/nettle/files/nettle-1.13-PIC.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-PIC patch to fix TEXTREL's in the library.
-
-Patch by PaX team
-
---- nettle/x86/aes-encrypt.asm
-+++ nettle/x86/aes-encrypt.asm
-@@ -42,20 +42,29 @@
- 	pushl	%esi		C  8(%esp)
- 	pushl	%edi		C  4(%esp)
- 
--	C ctx = 20(%esp)
--	C length = 24(%esp)
--	C dst = 28(%esp)
--	C src = 32(%esp)
-+#ifdef __PIC__
-+#undef __i686
-+	call	___i686.get_pc_thunk.bx
-+	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-+	pushl	C_NAME(_nettle_aes_encrypt_table)@GOT(%ebx)
-+#else
-+	pushl	C_NAME(_nettle_aes_encrypt_table)
-+#endif
-+
-+	C ctx = 24(%esp)
-+	C length = 28(%esp)
-+	C dst = 32(%esp)
-+	C src = 36(%esp)
- 
--	movl	24(%esp), %ebp
-+	movl	28(%esp), %ebp
- 	testl	%ebp,%ebp
- 	jz	.Lend
- 	
- .Lblock_loop:
--	movl	20(%esp),%esi	C  address of context struct ctx
--	movl	32(%esp),%ebp	C  address of plaintext
-+	movl	24(%esp),%esi	C  address of context struct ctx
-+	movl	36(%esp),%ebp	C  address of plaintext
- 	AES_LOAD(%esi, %ebp)
--	addl	$16, 32(%esp)	C Increment src pointer
-+	addl	$16, 36(%esp)	C Increment src pointer
- 
- 	C  get number of rounds to do from ctx struct	
- 	movl	AES_NROUNDS (%esi),%ebp
-@@ -65,16 +74,16 @@
- .Lround_loop:
- 	pushl	%esi		C  save this first: we'll clobber it later
- 
--	AES_ROUND(C_NAME(_nettle_aes_encrypt_table),a,b,c,d)
-+	AES_ROUND(4(%esp),a,b,c,d)
- 	pushl	%edi		C  save first on stack
- 
--	AES_ROUND(C_NAME(_nettle_aes_encrypt_table),b,c,d,a)
-+	AES_ROUND(8(%esp),b,c,d,a)
- 	pushl	%edi		C  save first on stack
- 
--	AES_ROUND(C_NAME(_nettle_aes_encrypt_table),c,d,a,b)
-+	AES_ROUND(12(%esp),c,d,a,b)
- 	pushl	%edi		C  save first on stack
- 
--	AES_ROUND(C_NAME(_nettle_aes_encrypt_table),d,a,b,c)
-+	AES_ROUND(16(%esp),d,a,b,c)
- 	
- 	movl	%edi,%edx
- 	popl	%ecx
-@@ -112,23 +121,24 @@
- 	C S-box substitution
- 	mov	$4,%edi
- .Lsubst:
--	AES_SUBST_BYTE(C_NAME(_nettle_aes_encrypt_table))
-+	AES_SUBST_BYTE((%esp))
- 
- 	decl	%edi
- 	jnz	.Lsubst
- 
- 	C Add last subkey, and store encrypted data
--	movl	28(%esp),%edi
-+	movl	32(%esp),%edi
- 	AES_STORE(%esi, %edi)
- 	
--	addl	$16, 28(%esp)	C Increment destination pointer
--	subl	$16, 24(%esp)	C Length
-+	addl	$16, 32(%esp)	C Increment destination pointer
-+	subl	$16, 28(%esp)	C Length
- 
- 	C NOTE: Will loop forever if input data is not an
- 	C integer number of blocks.
- 	jnz	.Lblock_loop
- 
- .Lend: 
-+	addl	$4, %esp
- 	popl	%edi
- 	popl	%esi
- 	popl	%ebp
-@@ -136,6 +146,16 @@
- 	ret
- EPILOGUE(nettle_aes_encrypt)
- 
-+#ifdef __PIC__
-+	.section	.gnu.linkonce.t.___i686.get_pc_thunk.bx,"ax",@progbits
-+.globl ___i686.get_pc_thunk.bx
-+	.hidden	___i686.get_pc_thunk.bx
-+	.type	___i686.get_pc_thunk.bx, @function
-+___i686.get_pc_thunk.bx:
-+	movl	(%esp), %ebx
-+	ret
-+#endif
-+
- #ifdef __ELF__
- .section .note.GNU-stack,"",@progbits
- #endif
---- nettle/x86/aes-decrypt.asm
-+++ nettle/x86/aes-decrypt.asm
-@@ -31,20 +31,29 @@
- 	pushl	%esi		C  8(%esp)
- 	pushl	%edi		C  4(%esp)
- 
--	C ctx = 20(%esp)
--	C length = 24(%esp)
--	C dst = 28(%esp)
--	C src = 32(%esp)
-+#ifdef __PIC__
-+#undef __i686
-+	call	___i686.get_pc_thunk.bx
-+	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-+	pushl	C_NAME(_nettle_aes_decrypt_table)@GOT(%ebx)
-+#else
-+	pushl	C_NAME(_nettle_aes_decrypt_table)
-+#endif
-+
-+	C ctx = 24(%esp)
-+	C length = 28(%esp)
-+	C dst = 32(%esp)
-+	C src = 36(%esp)
- 
--	movl	24(%esp), %ebp
-+	movl	28(%esp), %ebp
- 	testl	%ebp,%ebp
- 	jz	.Lend
- 	
- .Lblock_loop:
--	movl	20(%esp),%esi	C  address of context struct ctx
--	movl	32(%esp),%ebp	C  address of plaintext
-+	movl	24(%esp),%esi	C  address of context struct ctx
-+	movl	36(%esp),%ebp	C  address of plaintext
- 	AES_LOAD(%esi, %ebp)
--	addl	$16, 32(%esp)	C Increment src pointer
-+	addl	$16, 36(%esp)	C Increment src pointer
- 
- 	C  get number of rounds to do from struct	
- 	movl	AES_NROUNDS (%esi),%ebp	
-@@ -57,16 +66,16 @@
- 	C In these patterns, note that each row, like
- 	C "a,d,c,b" corresponds to one *column* of the 
- 	C array _aes_decrypt_table.idx.
--	AES_ROUND(C_NAME(_nettle_aes_decrypt_table),a,d,c,b)
-+	AES_ROUND(4(%esp),a,d,c,b)
- 	pushl	%edi		C  save first on stack
- 
--	AES_ROUND(C_NAME(_nettle_aes_decrypt_table),b,a,d,c)
-+	AES_ROUND(8(%esp),b,a,d,c)
- 	pushl	%edi
- 
--	AES_ROUND(C_NAME(_nettle_aes_decrypt_table),c,b,a,d)
-+	AES_ROUND(12(%esp),c,b,a,d)
- 	pushl	%edi		C  save first on stack
- 
--	AES_ROUND(C_NAME(_nettle_aes_decrypt_table),d,c,b,a)
-+	AES_ROUND(16(%esp),d,c,b,a)
- 
- 	movl	%edi,%edx
- 	popl	%ecx
-@@ -104,23 +113,24 @@
- 	C inverse S-box substitution
- 	mov	$4,%edi
- .Lsubst:
--	AES_SUBST_BYTE(C_NAME(_nettle_aes_decrypt_table))
-+	AES_SUBST_BYTE((%esp))
- 
- 	decl	%edi
- 	jnz	.Lsubst
- 
- 	C Add last subkey, and store encrypted data
--	movl	28(%esp),%edi
-+	movl	32(%esp),%edi
- 	AES_STORE(%esi, %edi)
- 	
--	addl	$16, 28(%esp)	C Increment destination pointer
--	subl	$16, 24(%esp)	C Length
-+	addl	$16, 32(%esp)	C Increment destination pointer
-+	subl	$16, 28(%esp)	C Length
- 
- 	C NOTE: Will loop forever if input data is not an
- 	C integer number of blocks.
- 	jnz	.Lblock_loop
- 
- .Lend: 
-+	addl	$4, %esp
- 	popl	%edi
- 	popl	%esi
- 	popl	%ebp
-@@ -128,6 +138,16 @@
- 	ret
- EPILOGUE(nettle_aes_decrypt)
- 
-+#ifdef __PIC__
-+	.section	.gnu.linkonce.t.___i686.get_pc_thunk.bx,"ax",@progbits
-+.globl ___i686.get_pc_thunk.bx
-+	.hidden	___i686.get_pc_thunk.bx
-+	.type	___i686.get_pc_thunk.bx, @function
-+___i686.get_pc_thunk.bx:
-+	movl	(%esp), %ebx
-+	ret
-+#endif
-+
- #ifdef __ELF__
- .section .note.GNU-stack,"",@progbits
- #endif
---- nettle/x86/machine.m4
-+++ nettle/x86/machine.m4
-@@ -36,19 +36,23 @@ define(<AES_ROUND>, <
- 	movl	%e<>$2<>x, %esi
- 	andl	<$>0xff, %esi
- 	shll	<$>2,%esi		C  index in table
--	movl	AES_TABLE0 + $1 (%esi),%edi
-+	addl	$1, %esi
-+	movl	AES_TABLE0 (%esi),%edi
- 	movl	%e<>$3<>x, %esi
- 	shrl	<$>6,%esi
- 	andl	<$>0x000003fc,%esi C  clear all but offset bytes
--	xorl	AES_TABLE1 + $1 (%esi),%edi
-+	addl	$1, %esi
-+	xorl	AES_TABLE1 (%esi),%edi
- 	movl	%e<>$4<>x,%esi	C  third one
- 	shrl	<$>14,%esi
- 	andl	<$>0x000003fc,%esi
--	xorl	AES_TABLE2 + $1 (%esi),%edi
-+	addl	$1, %esi
-+	xorl	AES_TABLE2 (%esi),%edi
- 	movl	%e<>$5<>x,%esi	C  fourth one
- 	shrl	<$>22,%esi
- 	andl	<$>0x000003fc,%esi
--	xorl	AES_TABLE3 + $1 (%esi),%edi>)dnl
-+	addl	$1, %esi
-+	xorl	AES_TABLE3 (%esi),%edi>)dnl
- 
- dnl AES_FINAL_ROUND(a, b, c, d)
- dnl Computes one word of the final round. Leaves result in %edi.
-@@ -75,20 +79,24 @@ dnl the words one byte to the left.
- define(<AES_SUBST_BYTE>, <
- 	movl	%eax,%ebp
- 	andl	<$>0x000000ff,%ebp
--	movb	AES_SBOX + $1 (%ebp),%al
-+	addl	$1, %ebp
-+	movb	AES_SBOX (%ebp),%al
- 	roll	<$>8,%eax
- 
- 	movl	%ebx,%ebp
- 	andl	<$>0x000000ff,%ebp
--	movb	AES_SBOX + $1 (%ebp),%bl
-+	addl	$1, %ebp
-+	movb	AES_SBOX (%ebp),%bl
- 	roll	<$>8,%ebx
- 
- 	movl	%ecx,%ebp
- 	andl	<$>0x000000ff,%ebp
--	movb	AES_SBOX + $1 (%ebp),%cl
-+	addl	$1, %ebp
-+	movb	AES_SBOX (%ebp),%cl
- 	roll	<$>8,%ecx
- 
- 	movl	%edx,%ebp
- 	andl	<$>0x000000ff,%ebp
--	movb	AES_SBOX + $1 (%ebp),%dl
-+	addl	$1, %ebp
-+	movb	AES_SBOX (%ebp),%dl
- 	roll	<$>8,%edx>)dnl
diff --git a/dev-libs/nettle/files/nettle-1.13-no-exec-stack.patch b/dev-libs/nettle/files/nettle-1.13-no-exec-stack.patch
deleted file mode 100644
index 618cb110a38a..000000000000
--- a/dev-libs/nettle/files/nettle-1.13-no-exec-stack.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Make sure library is generated without an executable stack
-
-Patch by PaX team
-
---- nettle/sparc/aes.asm
-+++ nettle/sparc/aes.asm
-@@ -363,3 +363,7 @@
- 	! aes256 (ECB decrypt): 11.13s, 0.898MB/s
- 	! aes256 (CBC encrypt): 15.30s, 0.654MB/s
- 	! aes256 (CBC decrypt): 12.93s, 0.773MB/s
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- nettle/x86/arcfour-crypt.asm
-+++ nettle/x86/arcfour-crypt.asm
-@@ -89,3 +89,7 @@
- 	popl	%ebx
- 	ret
- EPILOGUE(nettle_arcfour_crypt)
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- nettle/x86/aes.asm
-+++ nettle/x86/aes.asm
-@@ -4,3 +4,7 @@
- C isn't needed.
- 
- 	.file	"aes.asm"
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- nettle/x86/sha1-compress.asm
-+++ nettle/x86/sha1-compress.asm
-@@ -322,3 +322,7 @@
- C  of two instructions, one of which is a store, per two rounds. For the
- C  twenty rounds involving f3, that's 20 instructions, 10 of which are
- C  stores, or about 1.5 %.
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- nettle/x86/aes-encrypt.asm
-+++ nettle/x86/aes-encrypt.asm
-@@ -135,3 +135,7 @@
- 	popl	%ebx
- 	ret
- EPILOGUE(nettle_aes_encrypt)
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- nettle/x86/aes-decrypt.asm
-+++ nettle/x86/aes-decrypt.asm
-@@ -127,3 +127,7 @@
- 	popl	%ebx
- 	ret
- EPILOGUE(nettle_aes_decrypt)
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/dev-libs/nettle/files/nettle-1.13-preprocess-asm.patch b/dev-libs/nettle/files/nettle-1.13-preprocess-asm.patch
deleted file mode 100644
index af6cd1409c54..000000000000
--- a/dev-libs/nettle/files/nettle-1.13-preprocess-asm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Since we now use preprocessor macro's in the asm files, we
-need to make sure gcc preprocesses it.
-
-Patch by PaX team
-
---- nettle/Makefile.in
-+++ nettle/Makefile.in
-@@ -152,14 +152,14 @@
- 
- .asm.$(OBJEXT):
- 	$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
--		$< >$*.s
--	$(COMPILE) $(CCPIC_MAYBE) -c $*.s
-+		$< >$*.S
-+	$(COMPILE) $(CCPIC_MAYBE) -c $*.S
- 	echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
- 
- .asm.p$(OBJEXT):
- 	$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
--		$< >$*.s
--	$(COMPILE) $(SHLIBCFLAGS) -c $*.s -o $@
-+		$< >$*.S
-+	$(COMPILE) $(SHLIBCFLAGS) -c $*.S -o $@
- 	echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
- 
- # Texinfo rules
diff --git a/dev-libs/nettle/nettle-1.10.ebuild b/dev-libs/nettle/nettle-1.10.ebuild
deleted file mode 100644
index 869e9ca9aea6..000000000000
--- a/dev-libs/nettle/nettle-1.10.ebuild
+++ /dev/null
@@ -1,28 +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/nettle/nettle-1.10.ebuild,v 1.10 2007/07/12 02:25:35 mr_bones_ Exp $
-
-DESCRIPTION="cryptographic library that is designed to fit easily in any context"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-libs/gmp
-	!<dev-libs/lsh-1.4.3-r1"
-
-src_compile() {
-	# BUG #55238 is valid. We need a shared library as well.
-	# Danny van Dyk <kugelfang@gentoo.org> 2004/10/01
-	econf --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/nettle/nettle-1.12.ebuild b/dev-libs/nettle/nettle-1.12.ebuild
deleted file mode 100644
index 691c5ae0e715..000000000000
--- a/dev-libs/nettle/nettle-1.12.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/nettle/nettle-1.12.ebuild,v 1.3 2007/07/12 02:25:35 mr_bones_ Exp $
-
-DESCRIPTION="cryptographic library that is designed to fit easily in any context"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-libs/gmp
-	!<dev-libs/lsh-1.4.3-r1"
-
-src_compile() {
-	econf --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install  || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/nettle/nettle-1.13-r1.ebuild b/dev-libs/nettle/nettle-1.13-r1.ebuild
deleted file mode 100644
index 2385494fb971..000000000000
--- a/dev-libs/nettle/nettle-1.13-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/nettle/nettle-1.13-r1.ebuild,v 1.5 2007/07/12 02:25:35 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="cryptographic library that is designed to fit easily in any context"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-IUSE="gmp ssl"
-
-DEPEND="gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	!<dev-libs/lsh-1.4.3-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-preprocess-asm.patch
-	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
-	epatch "${FILESDIR}"/${P}-PIC.patch
-	sed -i \
-		-e '/CFLAGS/s:-ggdb3::' \
-		configure || die
-}
-
-src_compile() {
-	econf \
-		--enable-shared \
-		$(use_enable ssl openssl) \
-		$(use_enable gmp public-key) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install  || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/nettle/nettle-1.13.ebuild b/dev-libs/nettle/nettle-1.13.ebuild
deleted file mode 100644
index dced78b0c870..000000000000
--- a/dev-libs/nettle/nettle-1.13.ebuild
+++ /dev/null
@@ -1,33 +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/nettle/nettle-1.13.ebuild,v 1.2 2007/07/12 02:25:35 mr_bones_ Exp $
-
-DESCRIPTION="cryptographic library that is designed to fit easily in any context"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/gmp
-	!<dev-libs/lsh-1.4.3-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/CFLAGS/s:-ggdb3::' \
-		configure || die
-}
-
-src_compile() {
-	econf --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install  || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/nettle/nettle-1.14.ebuild b/dev-libs/nettle/nettle-1.14.ebuild
deleted file mode 100644
index 92cd1e7eac27..000000000000
--- a/dev-libs/nettle/nettle-1.14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-1.14.ebuild,v 1.4 2007/07/12 02:25:35 mr_bones_ Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="cryptographic library that is designed to fit easily in any context"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="gmp ssl"
-
-DEPEND="gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	!<dev-libs/lsh-1.4.3-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-make-as-needed.patch"
-	sed -i \
-		-e '/CFLAGS/s:-ggdb3::' \
-		configure.ac || die
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--enable-shared \
-		$(use_enable ssl openssl) \
-		$(use_enable gmp public-key) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install  || die
-	dodoc AUTHORS ChangeLog NEWS README
-}