Add support for USE=sse2 and reclassify i686/sparc7 targets #147551.

Package-Manager: portage-2.1.1

4 files changed, 27 insertions, 23 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 9c2327fafdd9..8becda351e12 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.190 2006/09/07 19:36:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.191 2006/09/15 01:28:25 vapier Exp $
+
+  15 Sep 2006; Mike Frysinger <vapier@gentoo.org> files/gentoo.config-0.9.8,
+  openssl-0.9.8c.ebuild:
+  Add support for USE=sse2 and reclassify i686/sparc7 targets #147551.
 
   07 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> openssl-0.9.7k.ebuild:
   Stable on hppa wrt security #146375
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 31a8c8746a4f..398e65ad1518 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -5,10 +5,10 @@ AUX gentoo.config-0.9.7g 3356 RMD160 8e83cecd44f2dc6b0863bf10b920cae2490250d7 SH
 MD5 5479124566140e079c2493abe59a1c90 files/gentoo.config-0.9.7g 3356
 RMD160 8e83cecd44f2dc6b0863bf10b920cae2490250d7 files/gentoo.config-0.9.7g 3356
 SHA256 1935ea31cf0d4c4a7f5ed0fa4434e9960c7ccef5cb43abcee26cff09472991eb files/gentoo.config-0.9.7g 3356
-AUX gentoo.config-0.9.8 3066 RMD160 e6be2ad78e00607b1b96d55e66e30d038b265da5 SHA1 758e501c98012de20d47379544d5878234b71871 SHA256 1a860381f83c6fa846be01be3ed6e43c9aac1c0e31786a35ceefe0ce8994dc8d
-MD5 dc693bca3252827079890068a6a97db6 files/gentoo.config-0.9.8 3066
-RMD160 e6be2ad78e00607b1b96d55e66e30d038b265da5 files/gentoo.config-0.9.8 3066
-SHA256 1a860381f83c6fa846be01be3ed6e43c9aac1c0e31786a35ceefe0ce8994dc8d files/gentoo.config-0.9.8 3066
+AUX gentoo.config-0.9.8 3039 RMD160 502b861ffca044a884240cc1b4f5ce1aff330e17 SHA1 c99a7712e998305f427d996100c3b039d88497ce SHA256 edf60be7dad3a7e49fc897179509826824cf004aa9e223246d1f5bcbe9990a12
+MD5 31db57005fd6607c4385c7dcc82712f2 files/gentoo.config-0.9.8 3039
+RMD160 502b861ffca044a884240cc1b4f5ce1aff330e17 files/gentoo.config-0.9.8 3039
+SHA256 edf60be7dad3a7e49fc897179509826824cf004aa9e223246d1f5bcbe9990a12 files/gentoo.config-0.9.8 3039
 AUX openssl-0.9.7-alpha-default-gcc.patch 533 RMD160 ea2d91421aa4d3f463034b40c2c81c195a71c0dd SHA1 f5ee85db45ab80b66225a222c7655b74760b94fe SHA256 814ae7c09359414e7dcd96008c82d868fba0565de2d1b3e6a4275f8cdbeefb5c
 MD5 f8ff492f66404c732e4661cc4443a2e8 files/openssl-0.9.7-alpha-default-gcc.patch 533
 RMD160 ea2d91421aa4d3f463034b40c2c81c195a71c0dd files/openssl-0.9.7-alpha-default-gcc.patch 533
@@ -89,14 +89,14 @@ EBUILD openssl-0.9.8b.ebuild 4997 RMD160 6900925606a9c21f3ae136fd400e2cc6961be37
 MD5 4b67c1cdcfc7fe43341536e549eb8db9 openssl-0.9.8b.ebuild 4997
 RMD160 6900925606a9c21f3ae136fd400e2cc6961be378 openssl-0.9.8b.ebuild 4997
 SHA256 c6172cdb7c1ad3728ac08c2474004c824a635ba9151a71751cd36dae8c53c1fd openssl-0.9.8b.ebuild 4997
-EBUILD openssl-0.9.8c.ebuild 5020 RMD160 a44c5c71f7bcaf26a240d86d4f908ff58859f57c SHA1 d3c09193decbfd7435cc4ed2dda41c7c9f2ea831 SHA256 f07e070e50fc7d58c4c63f259e5ee938ea74f54aa5f38df048d8052bc19a0da2
-MD5 395c62fc27f3046e74555e0200d0f652 openssl-0.9.8c.ebuild 5020
-RMD160 a44c5c71f7bcaf26a240d86d4f908ff58859f57c openssl-0.9.8c.ebuild 5020
-SHA256 f07e070e50fc7d58c4c63f259e5ee938ea74f54aa5f38df048d8052bc19a0da2 openssl-0.9.8c.ebuild 5020
-MISC ChangeLog 29182 RMD160 0103e0a2ea0847c2f04ca505dca64e1068c48bd7 SHA1 91ee813a685d7684737ab27899c2c033190fecf1 SHA256 8059faa57c26492205e0efa736ecf02f5a7ca186843d7bda55fca305d2e34167
-MD5 e493f195d2b1f9a76da82fa882011038 ChangeLog 29182
-RMD160 0103e0a2ea0847c2f04ca505dca64e1068c48bd7 ChangeLog 29182
-SHA256 8059faa57c26492205e0efa736ecf02f5a7ca186843d7bda55fca305d2e34167 ChangeLog 29182
+EBUILD openssl-0.9.8c.ebuild 5070 RMD160 1719516d82d40990c728a1ea824e97d277a9b805 SHA1 8e48417dedd628f2d6ec5acdb99f9c6a55d58ba8 SHA256 3a502bd2b6ba91cf372b4a4ce5ddb2c3ea175acef05b218fefa05da6bfc21df2
+MD5 52a4b8bdace871fc3aba33f74ee8111b openssl-0.9.8c.ebuild 5070
+RMD160 1719516d82d40990c728a1ea824e97d277a9b805 openssl-0.9.8c.ebuild 5070
+SHA256 3a502bd2b6ba91cf372b4a4ce5ddb2c3ea175acef05b218fefa05da6bfc21df2 openssl-0.9.8c.ebuild 5070
+MISC ChangeLog 29354 RMD160 3afc2dae3a539c242403af4d47a1ec91de8984c9 SHA1 fa02f7a368c20eba2012c38a2ea3498ef5fe107f SHA256 c1efe9010de5cd897a351b770d4ec15135c670c9712b0a40e8a2bf5e5ff9efc8
+MD5 1cb601c57d29558b11fe7e60c948b8f4 ChangeLog 29354
+RMD160 3afc2dae3a539c242403af4d47a1ec91de8984c9 ChangeLog 29354
+SHA256 c1efe9010de5cd897a351b770d4ec15135c670c9712b0a40e8a2bf5e5ff9efc8 ChangeLog 29354
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -116,7 +116,7 @@ SHA256 fdcfdfe6232573573e817138ff76277a9161c65fc21fe52b77dfb9a2a1fc863a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFA1aaamhnQswr0vIRAiLeAJ4iMkpUKBwpoGKAGvf5KuYeM/XfIgCfax3h
-PPW4aObRysSpXLCsppUbefs=
-=rB+/
+iD8DBQFFCgHJamhnQswr0vIRAtyOAJ96Xg7L8TsARn791dzhI6o35/RL1wCfR3RB
+6X3/GeA4+Eik66rWo3zO1U4=
+=1mcp
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/gentoo.config-0.9.8 b/dev-libs/openssl/files/gentoo.config-0.9.8
index b06a101bb454..294730fa40ca 100755
--- a/dev-libs/openssl/files/gentoo.config-0.9.8
+++ b/dev-libs/openssl/files/gentoo.config-0.9.8
@@ -1,7 +1,7 @@
 #!/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/gentoo.config-0.9.8,v 1.8 2006/09/06 20:30:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.8,v 1.9 2006/09/15 01:28:25 vapier Exp $
 #
 # Openssl doesn't play along nicely with cross-compiling 
 # like autotools based projects, so let's teach it new tricks.
@@ -17,7 +17,7 @@ if [[ $1 == "test" ]] ; then
 		"armv5b-linux-gnu             |linux-generic32 -DB_ENDIAN" \
 		"x86_64-pc-linux-gnu          |linux-x86_64" \
 		"alphaev56-unknown-linux-gnu  |linux-alpha+bwx-gcc" \
-		"i686-pc-linux-gnu            |linux-generic32" \
+		"i686-pc-linux-gnu            |linux-elf" \
 		"whatever-gentoo-freebsdX.Y   |BSD-generic32" \
 		"sparc64-alpha-freebsdX.Y     |BSD-sparc64" \
 		"ia64-gentoo-freebsd5.99234   |BSD-ia64" \
@@ -71,8 +71,7 @@ linux)
 		arm*)         machine="generic32 -DL_ENDIAN";;
 	#	hppa64*)      machine=parisc64;;
 		hppa*)        machine=parisc;;
-		i[0-5]86*)    machine=elf;;
-		i[6-9]86*)    machine=generic32;;
+		i[0-9]86*)    machine=elf;;
 		ia64*)        machine=ia64;;
 		m68*)         machine="generic32 -DB_ENDIAN";;
 		mips*el*)     machine="generic32 -DL_ENDIAN";;
@@ -82,7 +81,7 @@ linux)
 	#	sh64*)        machine=elf;;
 		sh*b*)        machine="generic32 -DB_ENDIAN";;
 		sh*)          machine="generic32 -DL_ENDIAN";;
-		sparc*v7*)    machine=sparcv7;;
+		sparc*v7*)    machine="generic32 -DB_ENDIAN";;
 		sparc64*)     machine=sparcv9;;
 		sparc*)       machine=sparcv8;;
 		s390x*)       machine=s390x;;
diff --git a/dev-libs/openssl/openssl-0.9.8c.ebuild b/dev-libs/openssl/openssl-0.9.8c.ebuild
index bf3d0d10b788..dd77340b4350 100644
--- a/dev-libs/openssl/openssl-0.9.8c.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8c.ebuild,v 1.9 2006/09/10 00:04:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8c.ebuild,v 1.10 2006/09/15 01:28:25 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"
 LICENSE="openssl"
 SLOT="0"
 KEYWORDS="-* alpha amd64 ~arm ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE="emacs test bindist zlib"
+IUSE="bindist emacs sse2 test zlib"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -73,6 +73,7 @@ src_compile() {
 		confopts="enable-idea enable-rc5 enable-mdc2 enable-ec"
 	fi
 	use zlib && confopts="${confopts} zlib-dynamic"
+	use sse2 || confopts="${confopts} no-sse2"
 
 	local sslout=$(./gentoo.config)
 	einfo "Use configuration ${sslout:-(openssl knows best)}"