| 1 |
commit: 3ce41ccc84347c96dc224fc2e0a04cad23b254a0 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Wed Apr 17 01:26:29 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 17 01:26:29 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce41ccc |
| 7 |
|
| 8 |
sys-cluster/ceph: Clean up openssl dependencies |
| 9 |
|
| 10 |
Copyright: Sony Interactive Entertainment Inc. |
| 11 |
Package-Manager: Portage-2.3.63, Repoman-2.3.12 |
| 12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-cluster/ceph/ceph-12.2.11.ebuild | 5 +---- |
| 15 |
sys-cluster/ceph/ceph-12.2.12-r1.ebuild | 5 +---- |
| 16 |
sys-cluster/ceph/ceph-12.2.8-r1.ebuild | 6 +++--- |
| 17 |
3 files changed, 5 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 20 |
index fc4fe164ce0..143e3b94205 100644 |
| 21 |
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 22 |
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild |
| 23 |
@@ -53,10 +53,7 @@ COMMON_DEPEND=" |
| 24 |
fuse? ( sys-fs/fuse:0=[static-libs?] ) |
| 25 |
xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 26 |
zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 27 |
- ssl? ( |
| 28 |
- <dev-libs/openssl-1.1:=[static-libs?] |
| 29 |
- !dev-libs/openssl:1.0.0 |
| 30 |
- ) |
| 31 |
+ ssl? ( <dev-libs/openssl-1.1:0=[static-libs?] ) |
| 32 |
radosgw? ( |
| 33 |
dev-libs/expat:=[static-libs?] |
| 34 |
<dev-libs/openssl-1.1:=[static-libs?] |
| 35 |
|
| 36 |
diff --git a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild |
| 37 |
index 5a7ad336c75..4e1b592301e 100644 |
| 38 |
--- a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild |
| 39 |
+++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild |
| 40 |
@@ -53,10 +53,7 @@ COMMON_DEPEND=" |
| 41 |
fuse? ( sys-fs/fuse:0=[static-libs?] ) |
| 42 |
xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 43 |
zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 44 |
- ssl? ( |
| 45 |
- <dev-libs/openssl-1.1:=[static-libs?] |
| 46 |
- !dev-libs/openssl:1.0.0 |
| 47 |
- ) |
| 48 |
+ ssl? ( dev-libs/openssl:0=[static-libs?] ) |
| 49 |
radosgw? ( |
| 50 |
dev-libs/expat:=[static-libs?] |
| 51 |
<dev-libs/openssl-1.1:=[static-libs?] |
| 52 |
|
| 53 |
diff --git a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild |
| 54 |
index 5ccb12358e2..8d369e5d48e 100644 |
| 55 |
--- a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild |
| 56 |
+++ b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2018 Gentoo Authors |
| 59 |
+# Copyright 1999-2019 Gentoo Authors |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
EAPI=6 |
| 63 |
@@ -51,12 +51,12 @@ COMMON_DEPEND=" |
| 64 |
lttng? ( dev-util/lttng-ust:= ) |
| 65 |
nss? ( dev-libs/nss:= ) |
| 66 |
fuse? ( sys-fs/fuse:0=[static-libs?] ) |
| 67 |
- ssl? ( dev-libs/openssl:=[static-libs?] ) |
| 68 |
+ ssl? ( dev-libs/openssl:0=[static-libs?] ) |
| 69 |
xfs? ( sys-fs/xfsprogs:=[static-libs?] ) |
| 70 |
zfs? ( sys-fs/zfs:=[static-libs?] ) |
| 71 |
radosgw? ( |
| 72 |
dev-libs/expat:=[static-libs?] |
| 73 |
- dev-libs/openssl:=[static-libs?] |
| 74 |
+ dev-libs/openssl:0=[static-libs?] |
| 75 |
net-misc/curl:=[curl_ssl_openssl,static-libs?] |
| 76 |
) |
| 77 |
system-boost? ( |
Archives