add test cases, fix system detection for linux, and touch up machine syntax

Package-Manager: portage-2.0.51.22-r1

2 files changed, 61 insertions, 40 deletions

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index f35383d6d257..f256a2968590 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,44 +1,34 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bbe4541e8b385a38bfca67af9c3aaf59 ChangeLog 19443
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074
 MD5 e59c3cc3221269d3ae08609d821b6b21 openssl-0.9.7c-r1.ebuild 7019
-MD5 5b33d1f91cb7d90e4d0d125905b8dfbb openssl-0.9.7d-r2.ebuild 8970
 MD5 aa6f82913db25a660c1e472864f6920d openssl-0.9.7e-r1.ebuild 8518
-MD5 b006190dcd671619b4028aa5ad2e994c openssl-0.9.7e.ebuild 7842
 MD5 0d2217720540cbf67914a930abf66364 openssl-0.9.7g.ebuild 5177
+MD5 5b33d1f91cb7d90e4d0d125905b8dfbb openssl-0.9.7d-r2.ebuild 8970
+MD5 b006190dcd671619b4028aa5ad2e994c openssl-0.9.7e.ebuild 7842
 MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
 MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
+MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67
 MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
+MD5 4e6c2cbbc1ff9e36ff6d83b6c5356b7c files/openssl-0.9.7-hppa-fix-detection.patch 1718
 MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d-r2 134
 MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e 134
-MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r1 134
-MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67
-MD5 a8a37fdd55a99637b02ddb45e77c96bc files/gentoo.config-0.9.7g 2244
 MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
 MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
 MD5 f8ff492f66404c732e4661cc4443a2e8 files/openssl-0.9.7-alpha-default-gcc.patch 533
 MD5 bef2724dccc11edf27916526d9c08576 files/openssl-0.9.7-arm-big-endian.patch 1074
-MD5 4e6c2cbbc1ff9e36ff6d83b6c5356b7c files/openssl-0.9.7-hppa-fix-detection.patch 1718
+MD5 ef2c8d5afa47da8a58e464f43e6ecc67 files/openssl-0.9.7g-mem-clr-ptr-cast.patch 637
 MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
 MD5 f804ea4df3b388d22451cde6e9458f2b files/openssl-0.9.7c-tempfile.patch 2178
 MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
 MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641
 MD5 f886f4a6a62eb4ec7bc718952d76900d files/openssl-0.9.7e-gentoo.patch 460
+MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r1 134
 MD5 53599279769faf50e5247b68d2907b10 files/openssl-0.9.7e-no-fips.patch 1344
-MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440
-MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881
-MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880
-MD5 ef2c8d5afa47da8a58e464f43e6ecc67 files/openssl-0.9.7g-mem-clr-ptr-cast.patch 637
 MD5 90fac5947e771433132723442dc90ab0 files/openssl-0.9.7g-no-fips.patch 333
+MD5 6fe82157d1370046682f9c3d39a55a18 files/gentoo.config-0.9.7g 3171
 MD5 cde67bc688a59d0178f1a6e1bb1db7cf files/openssl-0.9.7g-ptr-casting.patch 714
+MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881
+MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440
+MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880
 MD5 be045f45d974ec215ec4986c6c7b6ffb files/openssl-0.9.7g-ppc64.patch 856
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrZmoj5H05b2HAEkRAhgzAJ9vCQ8G6Vcz+JRVRhiH3R28OX3SBQCfZp++
-Q9wST2tBq7F592UWOqEV1/M=
-=rhzZ
------END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/gentoo.config-0.9.7g b/dev-libs/openssl/files/gentoo.config-0.9.7g
index d80af908e7cb..c3c6e63e0e6e 100755
--- a/dev-libs/openssl/files/gentoo.config-0.9.7g
+++ b/dev-libs/openssl/files/gentoo.config-0.9.7g
@@ -1,31 +1,66 @@
 #!/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.7g,v 1.5 2005/06/13 14:34:56 flameeyes Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.7g,v 1.6 2005/06/13 23:10:33 vapier Exp $
+#
 # 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" \
+		"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
+
+
+# Detect the operating system
 case ${CHOST} in
-	*-uclibc*)   system="linux";;
-	*-gnu*)      system="linux";;
+	*-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)
-	machine=""
-	case ${CHOST} in
+	case ${chost_machine} in
 		alphaev56*)   machine=alpha+bwx-${compiler};;
 		alphaev[67]*) machine=alpha+bwx-${compiler};;
 		alpha*)
@@ -36,12 +71,12 @@ linux)
 				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*eb*)      machine="elf-arm -DB_ENDIAN";;
+
+		arm*b*)       machine="elf-arm -DB_ENDIAN";;
 		arm*)         machine="elf-arm -DL_ENDIAN";;
 	#	hppa64*)      machine=parisc64;;
 		hppa*)        machine=parisc;;
@@ -62,21 +97,17 @@ linux)
 		s390*)        machine=s390;;
 		x86_64*)      machine=x86_64;;
 	esac
-;;
+	;;
 FreeBSD)
-	machine=""
-	case ${CHOST} in
+	case ${chost_machine} in
 		sparc64*)     machine=sparc64;;
 		ia64*)        machine=ia64;;
 		alpha*)       machine=alpha;;
 		*)            machine=elf;;
 	esac
-;;
-*)
-	exit 0
-;;
+	;;
 esac
 
-if [ -n "${machine}" ] ; then
-	echo ${system}-${machine}
-fi
+
+# If we have something, show it
+[[ -n ${machine} ]] && echo ${system}-${machine}