sys-cluster/ceph: Clean up openssl dependencies

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild
index fc4fe164ce0fe212dfe52cb7652ff35f51192269..143e3b94205e4e5f740c048ae9a613ed59592355 100644 (file)
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild
@@ -53,10 +53,7 @@ COMMON_DEPEND="
        fuse? ( sys-fs/fuse:0=[static-libs?] )
        xfs? ( sys-fs/xfsprogs:=[static-libs?] )
        zfs? ( sys-fs/zfs:=[static-libs?] )
-       ssl? (
-               <dev-libs/openssl-1.1:=[static-libs?]
-               !dev-libs/openssl:1.0.0
-       )
+       ssl? ( <dev-libs/openssl-1.1:0=[static-libs?] )
        radosgw? (
                dev-libs/expat:=[static-libs?]
                <dev-libs/openssl-1.1:=[static-libs?]

diff --git a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild
index 5a7ad336c75c68b6d8b618a87026e801f918690a..4e1b592301e559d4d2e20d4ef6ea4f55453b929c 100644 (file)
--- a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild
@@ -53,10 +53,7 @@ COMMON_DEPEND="
        fuse? ( sys-fs/fuse:0=[static-libs?] )
        xfs? ( sys-fs/xfsprogs:=[static-libs?] )
        zfs? ( sys-fs/zfs:=[static-libs?] )
-       ssl? (
-               <dev-libs/openssl-1.1:=[static-libs?]
-               !dev-libs/openssl:1.0.0
-       )
+       ssl? ( dev-libs/openssl:0=[static-libs?] )
        radosgw? (
                dev-libs/expat:=[static-libs?]
                <dev-libs/openssl-1.1:=[static-libs?]

diff --git a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
index 5ccb12358e2f2e98e7785f00f2298f58f879fa03..8d369e5d48e07a6c514dcfd37add2d9d875850e0 100644 (file)
--- a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,12 +51,12 @@ COMMON_DEPEND="
        lttng? ( dev-util/lttng-ust:= )
        nss? ( dev-libs/nss:= )
        fuse? ( sys-fs/fuse:0=[static-libs?] )
-       ssl? ( dev-libs/openssl:=[static-libs?] )
+       ssl? ( dev-libs/openssl:0=[static-libs?] )
        xfs? ( sys-fs/xfsprogs:=[static-libs?] )
        zfs? ( sys-fs/zfs:=[static-libs?] )
        radosgw? (
                dev-libs/expat:=[static-libs?]
-               dev-libs/openssl:=[static-libs?]
+               dev-libs/openssl:0=[static-libs?]
                net-misc/curl:=[curl_ssl_openssl,static-libs?]
        )
        system-boost? (