[gentoo-commits] repo/gentoo:master commit in: eclass/

[Anthony G. Basile]

commit:     7a4d6bd5fcb25d8381bc08e20ad6a5c1c80ad78f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 19:31:56 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 19:32:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a4d6bd5

Revert "ssl-cert.eclass: add libressl support"

This reverts commit ad0c2ab2bdbd34f4550e49c56cfd5974d6a2c07a.

 eclass/ssl-cert.eclass | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 2538f4d..002de76 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -30,10 +30,10 @@
 
 if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
        if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
-               DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0= 
dev-libs/libressl:0= ) )"
+               DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0= )"
                IUSE="${SSL_CERT_USE}"
        else
-               DEPEND="|| ( dev-libs/openssl:0= dev-libs/libressl:0= )"
+               DEPEND="dev-libs/openssl:0="
        fi
 fi
 
@@ -113,12 +113,8 @@ get_base() {
 gen_key() {
        local base=$(get_base "$1")
        ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
-       if openssl version | grep -i libressl > /dev/null; then
-               openssl genrsa -out "${base}.key" "${SSL_BITS}" &> /dev/null
-       else
-               openssl genrsa -rand "${SSL_RANDOM}" \
-                       -out "${base}.key" "${SSL_BITS}" &> /dev/null
-       fi
+       openssl genrsa -rand "${SSL_RANDOM}" \
+               -out "${base}.key" "${SSL_BITS}" &> /dev/null
        eend $?
 
        return $?