From: Patrick McLean <patrick.mclean@sony.com>
Date: Wed, 17 Apr 2019 01:26:29 +0000 (-0700)
Subject: sys-cluster/ceph: Clean up openssl dependencies
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3ce41ccc84347c96dc224fc2e0a04cad23b254a0;p=gentoo.git

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 fc4fe164ce0f..143e3b94205e 100644
--- 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 5a7ad336c75c..4e1b592301e5 100644
--- 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 5ccb12358e2f..8d369e5d48e0 100644
--- 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? (