Dont run src_test twice and namespace common manpages to prevent conflicts with other packages #132830 by Diego Pettenò.

Package-Manager: portage-2.1_rc1

8 files changed, 606 insertions, 44 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 33eec35f4a2e..0b79bd90cb5e 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.160 2006/05/05 14:53:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.161 2006/05/14 15:09:47 vapier Exp $
+
+  14 May 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/openssl-0.9.7j-doc-updates.patch,
+  +files/openssl-0.9.8b-doc-updates.patch, openssl-0.9.7i.ebuild,
+  openssl-0.9.7j.ebuild, openssl-0.9.8a.ebuild, openssl-0.9.8b.ebuild:
+  Dont run src_test twice and namespace common manpages to prevent conflicts
+  with other packages #132830 by Diego Pettenò.
 
 *openssl-0.9.8b (05 May 2006)
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 0c3dee5b0669..44a436f8f6f6 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -105,6 +105,10 @@ AUX openssl-0.9.7i-m68k.patch 408 RMD160 e3d6c310fc2aac42915c8b5de409a12af76c30b
 MD5 fe112407865186dff890a7cff71016ca files/openssl-0.9.7i-m68k.patch 408
 RMD160 e3d6c310fc2aac42915c8b5de409a12af76c30bd files/openssl-0.9.7i-m68k.patch 408
 SHA256 13bcd35320c59b3d8eb5038698b80fb703a8aabb8af452831228c69db9e8cf9d files/openssl-0.9.7i-m68k.patch 408
+AUX openssl-0.9.7j-doc-updates.patch 8748 RMD160 535a8611dfcb1a120a367be6fa5a8819cce5ec8c SHA1 d2b3729c0190f3191b89de6c76838f725d95e111 SHA256 42e118906eb960a96f4543682cb036bc26a1b16ed995382bc69140a0c1dac7c5 size 8748
+MD5 bb69a53d9490f560c24326aa706b3c22 files/openssl-0.9.7j-doc-updates.patch 8748
+RMD160 535a8611dfcb1a120a367be6fa5a8819cce5ec8c files/openssl-0.9.7j-doc-updates.patch 8748
+SHA256 42e118906eb960a96f4543682cb036bc26a1b16ed995382bc69140a0c1dac7c5 files/openssl-0.9.7j-doc-updates.patch 8748
 AUX openssl-0.9.8-CAN-2005-2969.patch 4169 RMD160 a945ec02acc98fe213eb58088d19a379f9aaee38 SHA1 f603449366d46a5d7692d0729b46f9a1f19eef3c SHA256 224e161ca0adee59f2494d4222401b6136f495a99f94be2dea37a3e1e0403488 size 4169
 MD5 5c3fdb5362f72b49a3d1b393514cc315 files/openssl-0.9.8-CAN-2005-2969.patch 4169
 RMD160 a945ec02acc98fe213eb58088d19a379f9aaee38 files/openssl-0.9.8-CAN-2005-2969.patch 4169
@@ -129,6 +133,10 @@ AUX openssl-0.9.8-toolchain.patch 991 RMD160 2a8a3cc1ed798219bc3679f96ddc22f432e
 MD5 933bb8d7ab02ba7e55a104ec9030c51a files/openssl-0.9.8-toolchain.patch 991
 RMD160 2a8a3cc1ed798219bc3679f96ddc22f432eeeed6 files/openssl-0.9.8-toolchain.patch 991
 SHA256 7eb44911807102d488c75d2e2be1e44c5c532c04ed67e1a1803a8fa5cb45b0c9 files/openssl-0.9.8-toolchain.patch 991
+AUX openssl-0.9.8b-doc-updates.patch 9053 RMD160 9e4de532f156e10f4c80711e0b6da0d3396d4f9e SHA1 58c3e2a530b1e7ace70925dde4e22a2ccbf69e22 SHA256 20cd7b8150f141c3c1f73e6cd36f9444ec8910c4a59649ef89e7f874449c651c size 9053
+MD5 5121762ec7850db65996d49f7d975b55 files/openssl-0.9.8b-doc-updates.patch 9053
+RMD160 9e4de532f156e10f4c80711e0b6da0d3396d4f9e files/openssl-0.9.8b-doc-updates.patch 9053
+SHA256 20cd7b8150f141c3c1f73e6cd36f9444ec8910c4a59649ef89e7f874449c651c files/openssl-0.9.8b-doc-updates.patch 9053
 AUX openssl-0.9.8b-parallel-build.patch 600 RMD160 ce857d7bfcf2039afc7ffe3d1badf9d3f374f672 SHA1 1b150a93c180300ce781be970ca68df4528076af SHA256 3219c6a1133f6df42909bcb5d30a097b88529e3964049a24dd3e9836a659f08d size 600
 MD5 d59919721f04f84d5d395c405a5be30d files/openssl-0.9.8b-parallel-build.patch 600
 RMD160 ce857d7bfcf2039afc7ffe3d1badf9d3f374f672 files/openssl-0.9.8b-parallel-build.patch 600
@@ -142,26 +150,26 @@ EBUILD openssl-0.9.6m.ebuild 3109 RMD160 c664b7690c4aa4ec9aeb6d4dc8b2a755e464e4b
 MD5 3e4c6c91a1c7a1a12f8c19ba6e7f40e1 openssl-0.9.6m.ebuild 3109
 RMD160 c664b7690c4aa4ec9aeb6d4dc8b2a755e464e4bc openssl-0.9.6m.ebuild 3109
 SHA256 94c91f074fa46df2de62ae18e0f69b884cbfdb9fc5c37934b52633c0a01ee64a openssl-0.9.6m.ebuild 3109
-EBUILD openssl-0.9.7i.ebuild 5521 RMD160 c7b84c11b69920b771bff8270ac6effd7d2d77b4 SHA1 9d539c83d896a1e2f809544a235c3179653e4e34 SHA256 f1da1a8ee170ba559d29d3db35b82a4aa00ded1c8f456de814e6caea5687dd21 size 5521
-MD5 6380e505056bcf03d9135240ab0d8970 openssl-0.9.7i.ebuild 5521
-RMD160 c7b84c11b69920b771bff8270ac6effd7d2d77b4 openssl-0.9.7i.ebuild 5521
-SHA256 f1da1a8ee170ba559d29d3db35b82a4aa00ded1c8f456de814e6caea5687dd21 openssl-0.9.7i.ebuild 5521
-EBUILD openssl-0.9.7j.ebuild 5484 RMD160 6329252634cf0071c8a5eeda8f460ed96e1f0133 SHA1 59e47e990701bd00d057ca4df7d366bc2bfe0a7c SHA256 180f6d680c03890b3cb75475329d24146fe4e5637c111e9d6e91cd3180c750b4 size 5484
-MD5 008230bb7fc05045aa9820f9802e897a openssl-0.9.7j.ebuild 5484
-RMD160 6329252634cf0071c8a5eeda8f460ed96e1f0133 openssl-0.9.7j.ebuild 5484
-SHA256 180f6d680c03890b3cb75475329d24146fe4e5637c111e9d6e91cd3180c750b4 openssl-0.9.7j.ebuild 5484
-EBUILD openssl-0.9.8a.ebuild 4608 RMD160 2495a4eeb485a2496f839b526fb58e3021f7c8ab SHA1 8503a2c1940ece79f5f256fe332405434dba4aec SHA256 0fe5ee32fbce112702c36eb54ea12db124b9f62504b4803f6d0afb6fd1f0939f size 4608
-MD5 7afd296589e04cd941c954449f493d4e openssl-0.9.8a.ebuild 4608
-RMD160 2495a4eeb485a2496f839b526fb58e3021f7c8ab openssl-0.9.8a.ebuild 4608
-SHA256 0fe5ee32fbce112702c36eb54ea12db124b9f62504b4803f6d0afb6fd1f0939f openssl-0.9.8a.ebuild 4608
-EBUILD openssl-0.9.8b.ebuild 4609 RMD160 920a42f5e4d3793569f528480a0ff007a20f4d47 SHA1 5bb3330becce67570dcd58b0938bc4d2ce6f6ea4 SHA256 401fc46e15691de2cb4dba14b39dfc085ddd06e0750f6ca54ad30db1241fbca9 size 4609
-MD5 35bd94a9b2ecb80aab2620c885d32375 openssl-0.9.8b.ebuild 4609
-RMD160 920a42f5e4d3793569f528480a0ff007a20f4d47 openssl-0.9.8b.ebuild 4609
-SHA256 401fc46e15691de2cb4dba14b39dfc085ddd06e0750f6ca54ad30db1241fbca9 openssl-0.9.8b.ebuild 4609
-MISC ChangeLog 25283 RMD160 21db14eea17d90054464c5bdeccfe6aa091daf0a SHA1 befe0acf74f16175eb91a6743a2da3a63f9997e4 SHA256 c4c7a8a6e4e55e07e7564af2495d2ec17b28c1f6778db98993c9adc51a6d111a size 25283
-MD5 b0102b2a1e3c0575b8af591a5d9d4729 ChangeLog 25283
-RMD160 21db14eea17d90054464c5bdeccfe6aa091daf0a ChangeLog 25283
-SHA256 c4c7a8a6e4e55e07e7564af2495d2ec17b28c1f6778db98993c9adc51a6d111a ChangeLog 25283
+EBUILD openssl-0.9.7i.ebuild 5562 RMD160 1b33bfee81b986b9ea95aa9738bb2ff5891fe4e4 SHA1 4a15692828d04b5f434bb25ce065b95fbe50834e SHA256 dba3fbebf3fcac37521eb06cc031a2f5106321174da24265fb6b763ca28ce740 size 5562
+MD5 fda54045f080f734d9ae7090077f5cc4 openssl-0.9.7i.ebuild 5562
+RMD160 1b33bfee81b986b9ea95aa9738bb2ff5891fe4e4 openssl-0.9.7i.ebuild 5562
+SHA256 dba3fbebf3fcac37521eb06cc031a2f5106321174da24265fb6b763ca28ce740 openssl-0.9.7i.ebuild 5562
+EBUILD openssl-0.9.7j.ebuild 5831 RMD160 bb6ddf002cbe30ec4c994911248b4ba4a4d70d05 SHA1 7934bb7c1b7ba45f86515dd524133727a7bbe0e6 SHA256 c8cdec49a0db953822650bb35ad53b3390d53aff8df0ea4f4a576d622ea3a0ad size 5831
+MD5 0cc104a4d0ac39757ea948168086bfcf openssl-0.9.7j.ebuild 5831
+RMD160 bb6ddf002cbe30ec4c994911248b4ba4a4d70d05 openssl-0.9.7j.ebuild 5831
+SHA256 c8cdec49a0db953822650bb35ad53b3390d53aff8df0ea4f4a576d622ea3a0ad openssl-0.9.7j.ebuild 5831
+EBUILD openssl-0.9.8a.ebuild 4638 RMD160 e3797aa05e3da402f58a9f51b9e0b74a2bbb85e7 SHA1 4f08f85c2d4303d5b2dc5d1203943443783c33e4 SHA256 32e1fea4333325b91256762290c0e7bbae14233fe704e79a89fd0ab598a993dc size 4638
+MD5 607aa938e793987e85165e8edb7ec783 openssl-0.9.8a.ebuild 4638
+RMD160 e3797aa05e3da402f58a9f51b9e0b74a2bbb85e7 openssl-0.9.8a.ebuild 4638
+SHA256 32e1fea4333325b91256762290c0e7bbae14233fe704e79a89fd0ab598a993dc openssl-0.9.8a.ebuild 4638
+EBUILD openssl-0.9.8b.ebuild 4931 RMD160 169e9383b7ce9b79ceb64eee417d7bbdd121af21 SHA1 a093224752214d4c0eec10d5cb8b1d8b6d67f4f2 SHA256 3c0dabe497293fdd137da9404a017030ecd50f9acf063fdb91d13a0952b5959f size 4931
+MD5 8d71738a2191a899283f2ca2e0262c6d openssl-0.9.8b.ebuild 4931
+RMD160 169e9383b7ce9b79ceb64eee417d7bbdd121af21 openssl-0.9.8b.ebuild 4931
+SHA256 3c0dabe497293fdd137da9404a017030ecd50f9acf063fdb91d13a0952b5959f openssl-0.9.8b.ebuild 4931
+MISC ChangeLog 25640 RMD160 2402e979184cb05cc02228e8ba3de456b8f4792b SHA1 9963c905e2a451dee22a82471ca713760e3f0e3f SHA256 7369137e476eb234fa23dc2ea8c656c03b39259bb41dff1d5eb18b343b6c0664 size 25640
+MD5 c1bc1a6dd1183ab9228c4537b1e6c32f ChangeLog 25640
+RMD160 2402e979184cb05cc02228e8ba3de456b8f4792b ChangeLog 25640
+SHA256 7369137e476eb234fa23dc2ea8c656c03b39259bb41dff1d5eb18b343b6c0664 ChangeLog 25640
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -184,7 +192,7 @@ SHA256 22f9cbf40e4a66b32fb3cf0c67cbb72708a7247df3880b01c4f2f74c657d03e1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEW2cx2+ySkm8kpY0RArOZAJ9XB6uCB5B6MwrDkOnynaYBJjrr0wCfR4h+
-tMcA+VNu17f77devSj7VWKw=
-=3bEc
+iD8DBQFEZ0it2+ySkm8kpY0RAnrPAKCkzTrYJ0SCNsyHwgCtdBpEG8hLSwCdFwEo
+yTeAmJltTix0fCpBRzA6IxY=
+=pw1A
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-0.9.7j-doc-updates.patch b/dev-libs/openssl/files/openssl-0.9.7j-doc-updates.patch
new file mode 100644
index 000000000000..6ac1ddc124a4
--- /dev/null
+++ 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=    .
diff --git a/dev-libs/openssl/files/openssl-0.9.8b-doc-updates.patch b/dev-libs/openssl/files/openssl-0.9.8b-doc-updates.patch
new file mode 100644
index 000000000000..321e4861a05d
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.8b-doc-updates.patch
@@ -0,0 +1,268 @@
+--- doc/crypto/ASN1_generate_nconf.pod
++++ doc/crypto/ASN1_generate_nconf.pod
+@@ -6,6 +6,8 @@ ASN1_generate_nconf, ASN1_generate_v3 - 
+ 
+ =head1 SYNOPSIS
+ 
++ #include <openssl/asn1.h>
++
+  ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf);
+  ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);
+ 
+--- 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=    .
diff --git a/dev-libs/openssl/openssl-0.9.7i.ebuild b/dev-libs/openssl/openssl-0.9.7i.ebuild
index a23514b10ace..a864380ff317 100644
--- a/dev-libs/openssl/openssl-0.9.7i.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7i.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.7i.ebuild,v 1.22 2006/04/21 00:29:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7i.ebuild,v 1.23 2006/05/14 15:09:47 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -111,7 +111,9 @@ src_compile() {
 		all || die "make all failed"
 
 	# force until we get all the gentoo.config kinks worked out
-	tc-is-cross-compiler || src_test
+	if ! has test ${FEATURES} && ! tc-is-cross-compiler ; then
+		src_test
+	fi
 }
 
 src_test() {
diff --git a/dev-libs/openssl/openssl-0.9.7j.ebuild b/dev-libs/openssl/openssl-0.9.7j.ebuild
index 22fd27b65aa4..bdbd946f3930 100644
--- a/dev-libs/openssl/openssl-0.9.7j.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7j.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.7j.ebuild,v 1.1 2006/05/05 14:51:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7j.ebuild,v 1.2 2006/05/14 15:09:47 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -35,6 +35,7 @@ src_unpack() {
 	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.7g gentoo.config || die "cp cross-compile failed"
@@ -110,7 +111,9 @@ src_compile() {
 		all || die "make all failed"
 
 	# force until we get all the gentoo.config kinks worked out
-	tc-is-cross-compiler || src_test
+	if ! has test ${FEATURES} && ! tc-is-cross-compiler ; then
+		src_test
+	fi
 }
 
 src_test() {
@@ -139,12 +142,20 @@ src_install() {
 	LD_LIBRARY_PATH="${D}"/usr/$(get_libdir)/ \
 	OPENSSL="${D}"/usr/bin/openssl /usr/bin/perl tools/c_rehash "${D}"/etc/ssl/certs
 
-	# These man pages with other packages so rename them
+	# Namespace openssl programs to prevent conflicts with other man pages
 	cd "${D}"/usr/share/man
-	for m in man1/passwd.1 man3/rand.3 man3/err.3 ; do
-		d=${m%%/*} ; m=${m##*/}
+	local m d s
+	for m in $(find . -type f -printf '%P ' | xargs grep -L '#include') ; do
+		d=${m%/*} ; m=${m##*/}
 		mv ${d}/{,ssl-}${m}
 		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page
+		for s in $(find ${d} -lname ${m}) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
 	done
 
 	fperms a+x /usr/$(get_libdir)/pkgconfig #34088
diff --git a/dev-libs/openssl/openssl-0.9.8a.ebuild b/dev-libs/openssl/openssl-0.9.8a.ebuild
index b21e5258ef11..44303b1309bf 100644
--- a/dev-libs/openssl/openssl-0.9.8a.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8a.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.8a.ebuild,v 1.5 2006/03/09 23:49:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8a.ebuild,v 1.6 2006/05/14 15:09:47 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -102,12 +102,12 @@ src_compile() {
 	emake all rehash || die "make all failed"
 
 	# force until we get all the gentoo.config kinks worked out
-	src_test
+	if ! has test ${FEATURES} && ! tc-is-cross-compiler ; then
+		src_test
+	fi
 }
 
 src_test() {
-	tc-is-cross-compiler && return 0
-
 	# make sure sandbox doesnt die on *BSD
 	add_predict /dev/crypto
 
diff --git a/dev-libs/openssl/openssl-0.9.8b.ebuild b/dev-libs/openssl/openssl-0.9.8b.ebuild
index 357f24449a89..1e9c0602640c 100644
--- a/dev-libs/openssl/openssl-0.9.8b.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8b.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.8b.ebuild,v 1.1 2006/05/05 14:53:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8b.ebuild,v 1.2 2006/05/14 15:09:47 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.9.8b-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.patch
 	epatch "${FILESDIR}"/${PN}-0.9.8-toolchain.patch
+	epatch "${FILESDIR}"/${PN}-0.9.8b-doc-updates.patch
 
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
@@ -102,12 +103,12 @@ src_compile() {
 	emake all rehash || die "make all failed"
 
 	# force until we get all the gentoo.config kinks worked out
-	src_test
+	if ! has test ${FEATURES} && ! tc-is-cross-compiler ; then
+		src_test
+	fi
 }
 
 src_test() {
-	tc-is-cross-compiler && return 0
-
 	# make sure sandbox doesnt die on *BSD
 	add_predict /dev/crypto
 
@@ -130,12 +131,20 @@ src_install() {
 	cp -RP certs/* "${D}"/etc/ssl/certs/ || die "failed to install certs"
 	rm -r "${D}"/etc/ssl/certs/{demo,expired}
 
-	# These man pages conflict with other packages so rename them
+	# Namespace openssl programs to prevent conflicts with other man pages
 	cd "${D}"/usr/share/man
-	for m in man1/passwd.1 man3/rand.3 man3/err.3 ; do
-		d=${m%%/*} ; m=${m##*/}
-		mv -f ${d}/{,ssl-}${m}
-		ln -snf ssl-${m} ${d}/openssl-${m}
+	local m d s
+	for m in $(find . -type f -printf '%P ' | xargs grep -L '#include') ; do
+		d=${m%/*} ; m=${m##*/}
+		mv ${d}/{,ssl-}${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page
+		for s in $(find ${d} -lname ${m}) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
 	done
 }