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

(Portage version: 2.1_rc1)

7 files changed, 575 insertions, 21 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/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
 }