add new libs

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@2787 6952d904-891a-0410-993b-d76249ca496b
2010-12-26 12:31:35 +00:00
parent e88576bf85
commit 91fc009f40
71 changed files with 3237 additions and 282 deletions
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,11 +1,15 @@
 AUX alphacpuid.s 1641 RMD160 d17ba2ec61e0a380e74f554ba58b9cf9c31805c8 SHA1 5fab001dbd6af763a809eff5f68e5e2430059b46 SHA256 f754956f7de5ffa07762ac4b574b29a5de016c181382c233d17ac8009b770be9
 AUX gentoo.config-0.9.7 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
+AUX gentoo.config-0.9.7g 3363 RMD160 48b94beed5c028a6706f4dd097197f00f0e016c0 SHA1 1588adae2922301159d8fc3907c9428959226462 SHA256 27f41e4940a48c2911e61e73f77b680c7d37a9ecfa540d5310e8d2b33044c651
+AUX openssl-0.9.7-alpha-default-gcc.patch 533 RMD160 ea2d91421aa4d3f463034b40c2c81c195a71c0dd SHA1 f5ee85db45ab80b66225a222c7655b74760b94fe SHA256 814ae7c09359414e7dcd96008c82d868fba0565de2d1b3e6a4275f8cdbeefb5c
+AUX openssl-0.9.7-hppa-fix-detection.patch 1718 RMD160 cc9f87f8da1cbcd1043160c0f90bc7a15cdd3e9e SHA1 742c5558883f1e0c5e9f5ec07249ff8b1f881d8b SHA256 bea60d8f4fcf213ddfe75f2e68af1cd203cf43b06f2400e5954cb1401b9129f0
 AUX openssl-0.9.7e-gentoo.patch 460 RMD160 60969fd05a15fe00d0d1c27b9098acfde28ba65e SHA1 73ff3c336dfdbeed903ac7b82486674ab4ec66a2 SHA256 ddb8d47429f3aadf3f5142293a2c38cbb9eb3927edfd1b497771337c48a11641
-AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f2e993949b SHA1 d07542663f934d5dc2f8f8b8985bde9b033aafdb SHA256 8a79f022a17a7fadb4eb708538b41a7a034e21ad84162beb1f7fa7cff5eb487e
-AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e83ca97 SHA1 72e7ccca848425d7cfc3f58f4476fb8fda4ec2d1 SHA256 00179ad3dc3fecc9193658202d7bb5c81169bbb2be59e8a90201ed43eacec805
-AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c
-AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876
-AUX openssl-1.0.0a-fix-double-free.patch 252 RMD160 4cf11701c503eb28ce2cea834523b9ec3e38bd4a SHA1 4006be947a41f77c471504d4770dbf8b36b315b8 SHA256 a179daada4021897dc2759e9555b22f5dcb511c1d011bbab8106b35fd2332b96
-AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
+AUX openssl-0.9.7g-amd64-fbsd.patch 1695 RMD160 b4f6d67791dbb307d0f178adefbacc68e5c8f8f1 SHA1 4a8c935e9286a5a10e37d4d2949799f5fef630df SHA256 79cf3189845a4c7147914c5d514f041ce0ee33759a37acd4131aa7f05df2a977
+AUX openssl-0.9.7g-mem-clr-ptr-cast.patch 637 RMD160 77a5b2d4df1d2a48f107a6d7e5de3539d25ed0f3 SHA1 0701f68a04e1098100e389b2518d436f3d742613 SHA256 4678af61ba6cbd6cc4de86025e00102a2c0461f1db1d99697bc091bf2248b7c5
+AUX openssl-0.9.7g-ppc64.patch 856 RMD160 943ddada0fc2193788e948ca244e9219c50bed5e SHA1 edb4fa25e8c5de72c8c899ba2430b36239b1cae0 SHA256 9bdcff5df5345e71e458ebde5850afb2d8e3d16e4178d765e3ae5ac65020c406
+AUX openssl-0.9.7g-superh.patch 1380 RMD160 90943f8d80364d52fdae82c3b582a567dc496302 SHA1 d184e4f185995c0c2190300539bd4878b593b005 SHA256 f6cf075b501d73d93ba41d8b5347bfd3690e32503b20fedb6f414dbf2d974665
+AUX openssl-0.9.7h-ABI-compat.patch 1131 RMD160 0b68f7abeabb4f76fd37f5371fe0f779265aee95 SHA1 85008cc58ab04dca57982dc7887bf294ea841af6 SHA256 10e54c23e9785a588bbc1af509645407b5b7483fbd3afdf0c8ed60f50c4887f1
+AUX openssl-0.9.7i-m68k.patch 408 RMD160 e3d6c310fc2aac42915c8b5de409a12af76c30bd SHA1 4c0877f388ffc141ea0152b79db8f16e7e592e52 SHA256 13bcd35320c59b3d8eb5038698b80fb703a8aabb8af452831228c69db9e8cf9d
+AUX openssl-0.9.7j-doc-updates.patch 8748 RMD160 535a8611dfcb1a120a367be6fa5a8819cce5ec8c SHA1 d2b3729c0190f3191b89de6c76838f725d95e111 SHA256 42e118906eb960a96f4543682cb036bc26a1b16ed995382bc69140a0c1dac7c5
 DIST openssl-0.9.7m.tar.gz 3303943 RMD160 fed13325d90ae4749d7ee858931d6925c3955614 SHA1 546f6bcebdf72a633bad087469d3741a42f7b383 SHA256 c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
-EBUILD openssl-0.9.7m.ebuild 4313 RMD160 0d1b65ddad82d9f5f8bf74e7d05ac5a851777d3a SHA1 0773519cc77a05817cefd716476b408fe6f2372c SHA256 2665c13c4c83be6aebef94703fa9cc0a0156b8f0010d748dd2538ca20fb865b3
+EBUILD openssl-0.9.7m.ebuild 3960 RMD160 80e96d5fb958f219f6ca3dace0d9e194c161beb3 SHA1 67c7b2e75d3cf6953ebdbd05a1ddf42580944fd2 SHA256 43492a299443e4b35d83d510bd954cb05b883da01d66717886f13f5348c45767
--- a/dev-libs/openssl/files/gentoo.config-0.9.7g
+++ b/dev-libs/openssl/files/gentoo.config-0.9.7g
@@ -0,0 +1,117 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/Attic/gentoo.config-0.9.7g,v 1.13 2007/10/07 16:57:24 vapier dead $
+#
+# Openssl doesn't play along nicely with cross-compiling 
+# like autotools based projects, so let's teach it new tricks.
+#
+# Review the bundled 'config' script to see why kind of targets 
+# we can pass to the 'Configure' script.
+
+
+# Testing routines
+if [[ $1 == "test" ]] ; then
+	for c in \
+		"arm-gentoo-linux-uclibc      |linux-elf-arm -DL_ENDIAN" \
+		"armv5b-linux-gnu             |linux-elf-arm -DB_ENDIAN" \
+		"x86_64-pc-linux-gnu          |linux-x86_64" \
+		"alphaev56-unknown-linux-gnu  |linux-alpha+bwx-gcc" \
+		"whatever-gentoo-freebsdX.Y   |FreeBSD-elf" \
+		"sparc64-alpha-freebsdX.Y     |FreeBSD-sparc64" \
+		"ia64-gentoo-freebsd5.99234   |FreeBSD-ia64" \
+		"x86_64-gentoo-freebsdX.Y     |FreeBSD-amd64" \
+		"hppa64-aldsF-linux-gnu5.3    |linux-parisc" \
+		"powerpc-gentOO-linux-uclibc  |linux-ppc" \
+		"powerpc64-unk-linux-gnu      |linux-ppc64" \
+	;do
+		CHOST=${c/|*}
+		ret_want=${c/*|}
+		ret_got=$(CHOST=${CHOST} "$0")
+
+		if [[ ${ret_want} == "${ret_got}" ]] ; then
+			echo "PASS: ${CHOST}"
+		else
+			echo "FAIL: ${CHOST}"
+			echo -e "\twanted: ${ret_want}"
+			echo -e "\twe got: ${ret_got}"
+		fi
+	done
+	exit 0
+fi
+[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
+
+
+# Detect the operating system
+case ${CHOST} in
+	*-linux*)    system="linux";;
+	*-freebsd*)  system="FreeBSD";;
+	*)           exit 0;;
+esac
+
+
+# Compiler munging
+compiler="gcc"
+if [[ ${CC} == "ccc" ]] ; then
+	compiler=${CC}
+fi
+
+
+# Detect target arch
+machine=""
+chost_machine=${CHOST%%-*}
+case ${system} in
+linux)
+	case ${chost_machine} in
+		alphaev56*)   machine=alpha+bwx-${compiler};;
+		alphaev[67]*) machine=alpha+bwx-${compiler};;
+		alpha*)
+			# this pretty hack is because we have to make sure we
+			# maintain ABI on the system or things like ssh break
+			currmachine=""
+			if [[ ${ROOT} == "/" ]] && [[ -e /usr/lib/libcrypto.so ]] ; then
+				currmachine=$(strings /usr/lib/libcrypto.so | grep ^linux-alpha | sed -e s:linux-::)
+			fi
+			machine=${currmachine:-alpha-${compiler}}
+
+			# NOTE: drop this crap next time SSL changes ABI #'s
+			[[ ${PV:0:5} != "0.9.7" ]] && machine="plzupdatemekthxbye"
+			;;
+
+		arm*b*)       machine="elf-arm -DB_ENDIAN";;
+		arm*)         machine="elf-arm -DL_ENDIAN";;
+	#	hppa64*)      machine=parisc64;;
+		hppa*)        machine=parisc;;
+		i[0-5]86*)    machine=elf;;
+		i[6-9]86*)    machine=pentium;;
+		ia64*)        machine=ia64;;
+		m68*)         machine=m68k;;
+		mips*el*)     machine=mipsel;;
+		mips*)        machine=mips;;
+		powerpc64*)   machine=ppc64;;
+		powerpc*)     machine=ppc;;
+	#	sh64*)        machine=elf;;
+		sh*b*)        machine="elf-sh -DB_ENDIAN";;
+		sh*)          machine="elf-sh -DL_ENDIAN";;
+		sparc*v7*)    machine=sparcv7;;
+		sparc64*)     machine=sparcv9;;
+		sparc*)       machine=sparcv8;;
+		s390x*)       machine=s390x;;
+		s390*)        machine=s390;;
+		x86_64*)      machine=x86_64;;
+	esac
+	;;
+FreeBSD)
+	case ${chost_machine} in
+		sparc64*)     machine=sparc64;;
+		ia64*)        machine=ia64;;
+		alpha*)       machine=alpha;;
+		x86_64*)      machine=amd64;;
+		*)            machine=elf;;
+	esac
+	;;
+esac
+
+
+# If we have something, show it
+[[ -n ${machine} ]] && echo ${system}-${machine}
--- a/dev-libs/openssl/files/openssl-0.9.7-alpha-default-gcc.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7-alpha-default-gcc.patch
@@ -0,0 +1,12 @@
+diff -ur openssl-0.9.7d.orig/config openssl-0.9.7d/config
+--- openssl-0.9.7d.orig/config	2004-12-11 19:01:11.077248504 -0500
+++ openssl-0.9.7d/config	2004-12-11 19:08:52.099162520 -0500
+@@ -452,7 +452,7 @@
+ 	sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'`
+   CCCVER=${CCCVER:-0}
+   if [ $CCCVER -gt 60 ]; then
+-    CC=ccc	# overrides gcc!!! well, ccc outperforms inoticeably
+    CC=gcc	# overrides gcc!!! well, ccc outperforms inoticeably
+ 		# only on hash routines and des, otherwise gcc (2.95)
+ 		# keeps along rather tight...
+   fi
--- a/dev-libs/openssl/files/openssl-0.9.7-hppa-fix-detection.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7-hppa-fix-detection.patch
@@ -0,0 +1,28 @@
+diff -ur openssl-0.9.7d.orig/Configure openssl-0.9.7d/Configure
+--- openssl-0.9.7d.orig/Configure	2004-12-11 19:01:11.078248352 -0500
+++ openssl-0.9.7d/Configure	2004-12-11 19:06:46.998180760 -0500
+@@ -315,7 +315,7 @@
+ "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):MPE:-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::",
+ 
+ #### PARISC Linux setups
+-"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
+"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion
+ # from the older DEC C Compiler to the newer compiler.  It's now the
+diff -ur openssl-0.9.7d.orig/config openssl-0.9.7d/config
+--- openssl-0.9.7d.orig/config	2004-12-11 19:01:11.077248504 -0500
+++ openssl-0.9.7d/config	2004-12-11 19:06:55.621869760 -0500
+@@ -564,9 +564,9 @@
+ 	sun4d)	OUT="linux-sparcv8" ;;
+ 	*)	OUT="linux-sparcv7" ;;
+ 	esac ;;
+-  parisc-*-linux2)
+  parisc*-*-linux2)
+-        CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo`
+-	CPUSCHEDULE=`awk '/^cpu.[ 	]: PA/{print substr($3,3)}' /proc/cpuinfo`
+        CPUARCH=`awk '/cpu family/{print substr($5,1,3)}' /proc/cpuinfo | head -n 1`
+	CPUSCHEDULE=`awk '/^cpu[[:space:]]*: PA/{print substr($3,3)}' /proc/cpuinfo | head -n 1`
+ 
+ 	# ??TODO ??  Model transformations
+ 	# 0. CPU Architecture for the 1.1 processor has letter suffixes. We strip that off
--- a/dev-libs/openssl/files/openssl-0.9.7g-amd64-fbsd.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7g-amd64-fbsd.patch
@@ -0,0 +1,11 @@
+diff -ur -x '*~' openssl-0.9.7g/Configure openssl-0.9.7g-gfbsd-amd64/Configure
+--- openssl-0.9.7g/Configure	2005-04-07 18:06:01.000000000 +0200
+++ openssl-0.9.7g-gfbsd-amd64/Configure	2005-08-11 16:23:42.000000000 +0200
+@@ -419,6 +419,7 @@
+ "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"FreeBSD-amd64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "FreeBSD",      "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
+ "bsdi-gcc",     "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}",
+ "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--- a/dev-libs/openssl/files/openssl-0.9.7g-mem-clr-ptr-cast.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7g-mem-clr-ptr-cast.patch
@@ -0,0 +1,19 @@
+Make sure when we cast as a pointer we don't truncate.
+
+Index: crypto/mem_clr.c
+===================================================================
+RCS file: /usr/local/src/openssl/cvs-tree/openssl/crypto/mem_clr.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- crypto/mem_clr.c	3 Dec 2002 16:06:40 -0000	1.2
+++ crypto/mem_clr.c	29 Apr 2005 14:26:59 -0000	1.3
+@@ -68,7 +68,7 @@
+ 	while(loop--)
+ 		{
+ 		*(p++) = cleanse_ctr;
+-		cleanse_ctr += (17 + (unsigned char)((int)p & 0xF));
+		cleanse_ctr += (17 + (unsigned char)((unsigned long)p & 0xF));
+ 		}
+ 	if(memchr(ptr, cleanse_ctr, len))
+ 		cleanse_ctr += 63;
--- a/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch
@@ -0,0 +1,11 @@
+Remove silly compiler flags which aren't needed.
+
+http://bugs.gentoo.org/92074
+
+--- openssl-0.9.7g/Configure
+++ openssl-0.9.7g/Configure
+@@ -407,3 +407,3 @@
+ # -bpowerpc64-linux is transient option, -m64 should be the one to use...
+-"linux-ppc64",  "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-ppc64",  "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
--- a/dev-libs/openssl/files/openssl-0.9.7g-superh.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7g-superh.patch
@@ -0,0 +1,23 @@
+diff -Naur openssl-0.9.7g.orig/Configure openssl-0.9.7g/Configure
+--- openssl-0.9.7g.orig/Configure	2005-04-08 01:06:01.000000000 +0900
+++ openssl-0.9.7g/Configure	2005-08-06 20:21:25.000000000 +0900
+@@ -438,6 +438,7 @@
+ # ARM comes in both little- and big-endian flavors. The following line is
+ # endian neutral, but ./config is free to throw in -D[BL]_ENDIAN...
+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-elf-sh","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
+diff -Naur openssl-0.9.7g.orig/config openssl-0.9.7g/config
+--- openssl-0.9.7g.orig/config	2005-04-08 05:26:10.000000000 +0900
+++ openssl-0.9.7g/config	2005-08-06 20:23:09.000000000 +0900
+@@ -604,6 +604,8 @@
+   arm*b-*-linux2) OUT="linux-elf-arm"; options="$options -DB_ENDIAN" ;;
+   arm*l-*-linux2) OUT="linux-elf-arm"; options="$options -DL_ENDIAN" ;;
+   arm*-*-linux2)  OUT="linux-elf-arm" ;;
+  sh*b-*-linux2) OUT="linux-elf-sh"; options="$options -DB_ENDIAN" ;;
+  sh*-*-linux2)  OUT="linux-elf-sh"; options="$options -DL_ENDIAN" ;;
+   s390-*-linux2) OUT="linux-s390" ;;
+   s390x-*-linux?) OUT="linux-s390x" ;;
+   x86_64-*-linux?) OUT="linux-x86_64" ;;
--- a/dev-libs/openssl/files/openssl-0.9.7h-ABI-compat.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7h-ABI-compat.patch
@@ -0,0 +1,11 @@
+Fix from RedHat:
+* Thu Mar 31 2005 Tomas Mraz <tmraz@redhat.com> 0.9.7f-2
+- disable broken bignum assembly on x86_64
+
+--- Configure
+++ Configure
+@@ -413,3 +413,3 @@
+ "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-x86_64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--- a/dev-libs/openssl/files/openssl-0.9.7i-m68k.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7i-m68k.patch
@@ -0,0 +1,11 @@
+enable shared libs on m68k
+
+patch by Kolbj<62>rn Barmen
+
+http://bugs.gentoo.org/113807
+
+--- Configure
+++ Configure
+@@ -407,1 +407,1 @@
+-"linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
+"linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--- a/dev-libs/openssl/files/openssl-0.9.7j-doc-updates.patch
+++ b/dev-libs/openssl/files/openssl-0.9.7j-doc-updates.patch
@@ -0,0 +1,257 @@
+--- doc/crypto/ASN1_OBJECT_new.pod
+++ doc/crypto/ASN1_OBJECT_new.pod
+@@ -6,6 +6,8 @@ ASN1_OBJECT_new, ASN1_OBJECT_free, - obj
+ 
+ =head1 SYNOPSIS
+ 
+ #include <openssl/asn1.h>
+
+  ASN1_OBJECT *ASN1_OBJECT_new(void);
+  void ASN1_OBJECT_free(ASN1_OBJECT *a);
+ 
+--- doc/crypto/ASN1_STRING_length.pod
+++ doc/crypto/ASN1_STRING_length.pod
+@@ -8,6 +8,8 @@ ASN1_STRING utility functions
+ 
+ =head1 SYNOPSIS
+ 
+ #include <openssl/asn1.h>
+
+  int ASN1_STRING_length(ASN1_STRING *x);
+  unsigned char * ASN1_STRING_data(ASN1_STRING *x);
+ 
+--- doc/crypto/ASN1_STRING_new.pod
+++ doc/crypto/ASN1_STRING_new.pod
+@@ -7,6 +7,8 @@ ASN1_STRING allocation functions
+ 
+ =head1 SYNOPSIS
+ 
+ #include <openssl/asn1.h>
+
+  ASN1_STRING * ASN1_STRING_new(void);
+  ASN1_STRING * ASN1_STRING_type_new(int type);
+  void ASN1_STRING_free(ASN1_STRING *a);
+--- doc/crypto/bn_internal.pod
+++ doc/crypto/bn_internal.pod
+@@ -13,6 +13,8 @@ library internal functions
+ 
+ =head1 SYNOPSIS
+ 
+ #include <openssl/bn.h>
+
+  BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);
+  BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num,
+    BN_ULONG w);
+--- doc/crypto/CRYPTO_set_ex_data.pod
+++ doc/crypto/CRYPTO_set_ex_data.pod
+@@ -6,6 +6,8 @@ CRYPTO_set_ex_data, CRYPTO_get_ex_data -
+ 
+ =head1 SYNOPSIS
+ 
+ #include <openssl/crypto.h>
+
+  int CRYPTO_set_ex_data(CRYPTO_EX_DATA *r, int idx, void *arg);
+ 
+  void *CRYPTO_get_ex_data(CRYPTO_EX_DATA *r, int idx);
+--- doc/crypto/OBJ_nid2obj.pod
+++ doc/crypto/OBJ_nid2obj.pod
+@@ -8,6 +8,8 @@ functions
+ 
+ =head1 SYNOPSIS
+ 
+ #include <openssl/objects.h>
+
+  ASN1_OBJECT * OBJ_nid2obj(int n);
+  const char *  OBJ_nid2ln(int n);
+  const char *  OBJ_nid2sn(int n);
+--- doc/crypto/PKCS7_decrypt.pod
+++ doc/crypto/PKCS7_decrypt.pod
+@@ -6,7 +6,9 @@ PKCS7_decrypt - decrypt content from a P
+ 
+ =head1 SYNOPSIS
+ 
+-int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
+ #include <openssl/pkcs7.h>
+
+ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/PKCS7_encrypt.pod
+++ doc/crypto/PKCS7_encrypt.pod
+@@ -6,7 +6,9 @@ PKCS7_encrypt - create a PKCS#7 envelope
+ 
+ =head1 SYNOPSIS
+ 
+-PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags);
+ #include <openssl/pkcs7.h>
+
+ PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/PKCS7_sign.pod
+++ doc/crypto/PKCS7_sign.pod
+@@ -6,7 +6,9 @@ PKCS7_sign - create a PKCS#7 signedData 
+ 
+ =head1 SYNOPSIS
+ 
+-PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags);
+ #include <openssl/pkcs7.h>
+
+ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, BIO *data, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/PKCS7_verify.pod
+++ doc/crypto/PKCS7_verify.pod
+@@ -6,9 +6,11 @@ PKCS7_verify - verify a PKCS#7 signedDat
+ 
+ =head1 SYNOPSIS
+ 
+-int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags);
+ #include <openssl/pkcs7.h>
+ 
+-STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
+ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata, BIO *out, int flags);
+
+ STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/SMIME_read_PKCS7.pod
+++ doc/crypto/SMIME_read_PKCS7.pod
+@@ -6,7 +6,9 @@ SMIME_read_PKCS7 - parse S/MIME message.
+ 
+ =head1 SYNOPSIS
+ 
+-PKCS7 *SMIME_read_PKCS7(BIO *in, BIO **bcont);
+ #include <openssl/pkcs7.h>
+
+ PKCS7 *SMIME_read_PKCS7(BIO *in, BIO **bcont);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/SMIME_write_PKCS7.pod
+++ doc/crypto/SMIME_write_PKCS7.pod
+@@ -6,7 +6,9 @@ SMIME_write_PKCS7 - convert PKCS#7 struc
+ 
+ =head1 SYNOPSIS
+ 
+-int SMIME_write_PKCS7(BIO *out, PKCS7 *p7, BIO *data, int flags);
+ #include <openssl/pkcs7.h>
+
+ int SMIME_write_PKCS7(BIO *out, PKCS7 *p7, BIO *data, int flags);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/ui_compat.pod
+++ doc/crypto/ui_compat.pod
+@@ -7,6 +7,8 @@ Compatibility user interface functions
+ 
+ =head1 SYNOPSIS
+ 
+ #include <openssl/des_old.h>
+
+  int des_read_password(DES_cblock *key,const char *prompt,int verify);
+  int des_read_2passwords(DES_cblock *key1,DES_cblock *key2,
+  	const char *prompt,int verify);
+--- doc/crypto/X509_NAME_add_entry_by_txt.pod
+++ doc/crypto/X509_NAME_add_entry_by_txt.pod
+@@ -7,15 +7,17 @@ X509_NAME_add_entry, X509_NAME_delete_en
+ 
+ =head1 SYNOPSIS
+ 
+-int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, const unsigned char *bytes, int len, int loc, int set);
+ #include <openssl/x509.h>
+ 
+-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type, unsigned char *bytes, int len, int loc, int set);
+ int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type, const unsigned char *bytes, int len, int loc, int set);
+ 
+-int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, unsigned char *bytes, int len, int loc, int set);
+ int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type, unsigned char *bytes, int len, int loc, int set);
+ 
+-int X509_NAME_add_entry(X509_NAME *name,X509_NAME_ENTRY *ne, int loc, int set);
+ int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type, unsigned char *bytes, int len, int loc, int set);
+ 
+-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
+ int X509_NAME_add_entry(X509_NAME *name,X509_NAME_ENTRY *ne, int loc, int set);
+
+ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/X509_NAME_ENTRY_get_object.pod
+++ doc/crypto/X509_NAME_ENTRY_get_object.pod
+@@ -9,15 +9,17 @@ X509_NAME_ENTRY_create_by_OBJ - X509_NAM
+ 
+ =head1 SYNOPSIS
+ 
+-ASN1_OBJECT * X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
+-ASN1_STRING * X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
+ #include <openssl/x509.h>
+ 
+-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj);
+-int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, const unsigned char *bytes, int len);
+ ASN1_OBJECT * X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
+ ASN1_STRING * X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
+ 
+-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const char *field, int type, const unsigned char *bytes, int len);
+-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,unsigned char *bytes, int len);
+-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len);
+ int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj);
+ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, const unsigned char *bytes, int len);
+
+ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne, const char *field, int type, const unsigned char *bytes, int len);
+ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid, int type,unsigned char *bytes, int len);
+ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne, ASN1_OBJECT *obj, int type, const unsigned char *bytes, int len);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/X509_NAME_get_index_by_NID.pod
+++ doc/crypto/X509_NAME_get_index_by_NID.pod
+@@ -8,14 +8,16 @@ X509_NAME lookup and enumeration functio
+ 
+ =head1 SYNOPSIS
+ 
+-int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos);
+-int X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj, int lastpos);
+ #include <openssl/x509.h>
+ 
+-int X509_NAME_entry_count(X509_NAME *name);
+-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
+ int X509_NAME_get_index_by_NID(X509_NAME *name,int nid,int lastpos);
+ int X509_NAME_get_index_by_OBJ(X509_NAME *name,ASN1_OBJECT *obj, int lastpos);
+ 
+-int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf,int len);
+-int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,int len);
+ int X509_NAME_entry_count(X509_NAME *name);
+ X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
+
+ int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf,int len);
+ int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, char *buf,int len);
+ 
+ =head1 DESCRIPTION
+ 
+--- doc/crypto/X509_new.pod
+++ doc/crypto/X509_new.pod
+@@ -6,6 +6,8 @@ X509_new, X509_free - X509 certificate A
+ 
+ =head1 SYNOPSIS
+ 
+ #include <openssl/x509.h>
+
+  X509 *X509_new(void);
+  void X509_free(X509 *a);
+ 
+--- Makefile.org
+++ Makefile.org
+@@ -218,7 +218,7 @@
+ MANDIR=$(OPENSSLDIR)/man
+ MAN1=1
+ MAN3=3
+-MANSUFFIX=
+MANSUFFIX=ssl
+ SHELL=/bin/sh
+ 
+ TOP=    .
--- a/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch
+++ b/dev-libs/openssl/files/openssl-0.9.8e-bsd-sparc64.patch
@@ -1,25 +0,0 @@
--- a/Configure
-+++ b/Configure
-@@ -365,7 +365,7 @@
- # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
- # simply *happens* to work around a compiler bug in gcc 3.3.3,
- # triggered by RIPEMD160 code.
-"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:ULTRASPARC::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- 
-
-the -B flag is a no-op nowadays
-
--- a/crypto/des/Makefile
-+++ b/crypto/des/Makefile
-@@ -62,7 +62,7 @@
- 	$(CC) $(CFLAGS) -o des des.o cbc3_enc.o $(LIB)
- 
- des_enc-sparc.S:	asm/des_enc.m4
-	m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
-+	m4 asm/des_enc.m4 > des_enc-sparc.S
- 
- # ELF
- dx86-elf.s:	asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
--- a/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch
+++ b/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/181438
-
-make sure we respect LDFLAGS
-
--- openssl-0.9.8h/Makefile.org
-+++ openssl-0.9.8h/Makefile.org
-@@ -180,6 +181,7 @@
- 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
- 		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
- 		MAKEDEPPROG='${MAKEDEPPROG}'			\
-+		LDFLAGS='${LDFLAGS}'		\
- 		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\
- 		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\
- 		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\
--- openssl-0.9.8h/Makefile.shared
-+++ openssl-0.9.8h/Makefile.shared
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
--- a/dev-libs/openssl/files/openssl-0.9.8l-binutils.patch
+++ b/dev-libs/openssl/files/openssl-0.9.8l-binutils.patch
@@ -1,67 +0,0 @@
-fix from upstream for building with newer binutils
-
-http://bugs.gentoo.org/289130
-
-Index: crypto/md5/asm/md5-x86_64.pl
-===================================================================
-RCS file: /usr/local/src/openssl/CVSROOT/openssl/crypto/md5/asm/md5-x86_64.pl,v
-retrieving revision 1.2.2.1
-retrieving revision 1.2.2.2
-diff -u -p -r1.2.2.1 -r1.2.2.2
--- openssl/crypto/md5/asm/md5-x86_64.pl	11 Nov 2007 13:34:06 -0000	1.2.2.1
-+++ openssl/crypto/md5/asm/md5-x86_64.pl	13 Nov 2009 14:14:46 -0000	1.2.2.2
-@@ -19,6 +19,7 @@ my $code;
- sub round1_step
- {
-     my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
-+    $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal
-     $code .= " mov	0*4(%rsi),	%r10d		/* (NEXT STEP) X[0] */\n" if ($pos == -1);
-     $code .= " mov	%edx,		%r11d		/* (NEXT STEP) z' = %edx */\n" if ($pos == -1);
-     $code .= <<EOF;
-@@ -42,6 +43,7 @@ EOF
- sub round2_step
- {
-     my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
-+    $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal
-     $code .= " mov	1*4(%rsi),	%r10d		/* (NEXT STEP) X[1] */\n" if ($pos == -1);
-     $code .= " mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */\n" if ($pos == -1);
-     $code .= <<EOF;
-@@ -65,6 +67,7 @@ EOF
- sub round3_step
- {
-     my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
-+    $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal
-     $code .= " mov	5*4(%rsi),	%r10d		/* (NEXT STEP) X[5] */\n" if ($pos == -1);
-     $code .= " mov	%ecx,		%r11d		/* (NEXT STEP) y' = %ecx */\n" if ($pos == -1);
-     $code .= <<EOF;
-@@ -87,6 +90,7 @@ EOF
- sub round4_step
- {
-     my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
-+    $T_i = unpack("l",pack("l", hex($T_i))); # convert to 32-bit signed decimal
-     $code .= " mov	0*4(%rsi),	%r10d		/* (NEXT STEP) X[0] */\n" if ($pos == -1);
-     $code .= " mov	\$0xffffffff,	%r11d\n" if ($pos == -1);
-     $code .= " xor	%edx,		%r11d		/* (NEXT STEP) not z' = not %edx*/\n"
-
-Ripped from Fedora
-
--- openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl.binutils	2009-11-12 15:17:29.000000000 +0100
-+++ openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl	2009-11-12 17:24:18.000000000 +0100
-@@ -150,7 +150,7 @@ ___
- sub BODY_20_39 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
-my $K=($i<40)?0x6ed9eba1:0xca62c1d6;
-+my $K=($i<40)?0x6ed9eba1:-0x359d3e2a;
- $code.=<<___ if ($i<79);
- 	lea	$K($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
-@@ -187,7 +187,7 @@ sub BODY_40_59 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
- $code.=<<___;
-	lea	0x8f1bbcdc($xi,$e),$f
-+	lea	-0x70e44324($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
- 	mov	$b,$t0
- 	mov	$b,$t1
--- a/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch
+++ b/dev-libs/openssl/files/openssl-0.9.8m-binutils.patch
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/289130
-
-Ripped from Fedora
-
--- openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl.binutils	2009-11-12 15:17:29.000000000 +0100
-+++ openssl-1.0.0-beta4/crypto/sha/asm/sha1-x86_64.pl	2009-11-12 17:24:18.000000000 +0100
-@@ -150,7 +150,7 @@ ___
- sub BODY_20_39 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
-my $K=($i<40)?0x6ed9eba1:0xca62c1d6;
-+my $K=($i<40)?0x6ed9eba1:-0x359d3e2a;
- $code.=<<___ if ($i<79);
- 	lea	$K($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
-@@ -187,7 +187,7 @@ sub BODY_40_59 {
- my ($i,$a,$b,$c,$d,$e,$f)=@_;
- my $j=$i+1;
- $code.=<<___;
-	lea	0x8f1bbcdc($xi,$e),$f
-+	lea	-0x70e44324($xi,$e),$f
- 	mov	`4*($j%16)`(%rsp),$xi
- 	mov	$b,$t0
- 	mov	$b,$t1
--- a/dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch
+++ b/dev-libs/openssl/files/openssl-1.0.0a-fix-double-free.patch
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/332027
-
--- ssl/s3_clnt.c
-+++ ssl/s3_clnt.c
-@@ -1508,6 +1508,7 @@
- 		s->session->sess_cert->peer_ecdh_tmp=ecdh;
- 		ecdh=NULL;
- 		BN_CTX_free(bn_ctx);
-+		bn_ctx = NULL;
- 		EC_POINT_free(srvr_ecpoint);
- 		srvr_ecpoint = NULL;
- 		}
--- a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
+++ b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/327421
-
--- Makefile.org
-+++ Makefile.org
-@@ -189,6 +189,7 @@
- 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
- 		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\
- 		MAKEDEPPROG='$(MAKEDEPPROG)'			\
-+		LDFLAGS='${LDFLAGS}'				\
- 		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
- 		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\
- 		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
--- Makefile.shared
-+++ Makefile.shared
-@@ -153,7 +153,7 @@
- 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
--- a/dev-libs/openssl/openssl-0.9.7m.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7m.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7o-r2.ebuild,v 1.1 2010/08/14 05:53:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/Attic/openssl-0.9.7m.ebuild,v 1.4 2007/10/07 16:57:23 vapier dead $

-# this ebuild is only for the libcrypto.so.0.9.7 and libssl.so.0.9.7 SONAME for ABI compat
+EAPI="1"

-EAPI=1
 inherit eutils flag-o-matic toolchain-funcs

 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
@@ -13,126 +12,123 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"

 LICENSE="openssl"
 SLOT="0.9.7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist gmp kerberos sse2 test zlib"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="emacs test bindist zlib"

-RDEPEND="gmp? ( dev-libs/gmp )
-	zlib? ( sys-libs/zlib )
-	kerberos? ( app-crypt/mit-krb5 )
-	!=dev-libs/openssl-0.9.7*:0"
+RDEPEND="!=dev-libs/openssl-0.9.7*:0"
 DEPEND="${RDEPEND}
 	sys-apps/diffutils
 	>=dev-lang/perl-5
 	test? ( sys-devel/bc )"
+PDEPEND="app-misc/ca-certificates"

 pkg_setup() {
-	[[ -e ${ROOT}/usr/$(get_libdir)/libcrypto.so.0.9.7 ]] && \
-		rm -f "${ROOT}"/usr/$(get_libdir)/libcrypto.so.0.9.7
-	[[ -e ${ROOT}/usr/$(get_libdir)/libssl.so.0.9.7 ]] && \
-		rm -f "${ROOT}"/usr/$(get_libdir)/libssl.so.0.9.7
+	# avoid collisions with openssl-1 (preserve lib)
+	if ! has_version dev-libs/openssl:${SLOT} ; then
+		ewarn "Removing lib{crypto,ssl}.so.0.9.7 to avoid collision with openssl-1"
+		rm -f "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.7
+	fi
 }

+
 src_unpack() {
 	unpack ${A}
+
 	cd "${S}"

+	epatch "${FILESDIR}"/${PN}-0.9.7g-ppc64.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
-	epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
-	epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130
-	epatch "${FILESDIR}"/${PN}-1.0.0a-fix-double-free.patch #332027
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
-		Makefile{,.org} \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+	epatch "${FILESDIR}"/${PN}-0.9.7-hppa-fix-detection.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7-alpha-default-gcc.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7g-mem-clr-ptr-cast.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7h-ABI-compat.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7g-superh.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7i-m68k.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7g-amd64-fbsd.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7j-doc-updates.patch

 	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-0.9.7 gentoo.config || die "cp cross-compile failed"
+	cp "${FILESDIR}"/gentoo.config-0.9.7g gentoo.config || die "cp cross-compile failed"
 	chmod a+rx gentoo.config

-	append-flags -fno-strict-aliasing
+	# Don't build manpages if we don't want them
+	has noman FEATURES && sed -i '/^install:/s:install_docs::' Makefile.org
+
+	case $(gcc-version) in
+		3.2)
+			filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loop
+		;;
+		3.4 | 3.3 )
+			filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops
+			[[ ${ARCH} == "ppc" ||  ${ARCH} == "ppc64" ]] && append-flags -fno-strict-aliasing
+		;;
+	esac
 	append-flags -Wa,--noexecstack

-	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
-	sed -i '/^"debug-steve/d' Configure # 0.9.7k shipped broken
-	./config --test-sanity || die "I AM NOT SANE"
+	# replace CFLAGS
+	OLDIFS=$IFS
+	IFS=$'\n'
+	for a in $( grep -n -e "^\"linux-" Configure ); do
+		LINE=$( echo $a | awk -F: '{print $1}' )
+		CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' )
+		NEW_CFLAGS=$(echo $CUR_CFLAGS | LC_ALL=C sed -r -e "s|-O[23]||" -e \
+		"s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::" \
+		-e "s:-mv8::")
+		# ppc64's current toolchain sucks at optimization and will break this package
+		[[ $(tc-arch) != "ppc64" ]] && NEW_CFLAGS="${NEW_CFLAGS} ${CFLAGS}"
+
+		sed -i "${LINE}s:$CUR_CFLAGS:$NEW_CFLAGS:" Configure || die "sed failed"
+	done
+	IFS=$OLDIFS
+
+	if [ "$(get_libdir)" != "lib" ] ; then
+		# using a library directory other than lib requires some magic
+		sed -i \
+			-e "s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/$(get_libdir)+g" \
+			-e "s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/$(get_libdir)+g" \
+			Makefile.org \
+			|| die "sed failed"
+		./config --test-sanity || die "sanity failed"
+	fi
 }

 src_compile() {
-	unset APPS #197996
-	unset SCRIPTS #312551
+	# Clean out patent-or-otherwise-encumbered code.
+	# RC5:   5,724,428 03/03/2015
+	# EC:    ????????? ??/??/2015
+	local confopts=""
+	use bindist && confopts="no-rc5 no-ec"

-	tc-export CC AR RANLIB
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     5,214,703 25/05/2010    http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
-	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+	use zlib && confopts="${confopts} zlib-dynamic"

 	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	einfo "Use configuration ${sslout}"
+
 	local config="Configure"
 	[[ -z ${sslout} ]] && config="config"
-	echoit \
 	./${config} \
 		${sslout} \
-		$(use sse2 || echo "no-sse2") \
-		enable-camellia \
-		$(use_ssl !bindist ec) \
-		$(use_ssl !bindist idea) \
-		enable-mdc2 \
-		$(use_ssl !bindist rc5) \
-		enable-tlsext \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl zlib) \
+		${confopts} \
 		--prefix=/usr \
 		--openssldir=/etc/ssl \
 		shared threads \
 		|| die "Configure failed"

-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^LIBDIR=/s:=.*:=$(get_libdir):" \
-		-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-		-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
-		Makefile || die
-
-	# depend is needed to use $confopts
-	emake -j1 depend || die "depend failed"
-	emake -j1 build_libs || die "make build_libs failed"
+	emake \
+		CC="$(tc-getCC)" MAKEDEPPROG="$(tc-getCC)" \
+		AR="$(tc-getAR) r" \
+		RANLIB="$(tc-getRANLIB)" \
+		all || die "make all failed"
 }

 src_test() {
-	emake -j1 test || die "make test failed"
+	# make sure sandbox doesnt die on *BSD
+	addpredict /dev/crypto
+
+	make test || die "make test failed"
 }

 src_install() {
-	dolib.so lib{crypto,ssl}.so.0.9.7 || die
+        dolib.so lib{crypto,ssl}.so.0.9.7 || die
 }
+