From 9ebd198caf0c422ea2d4dfd090a8e347208c1668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Mon, 31 May 2021 14:03:13 +0200 Subject: [PATCH] [dev-libs/Ice] remove libressl --- dev-libs/Ice/Ice-3.6.5-r2.ebuild | 5 ++--- dev-libs/Ice/Ice-3.6.9999.ebuild | 5 ++--- dev-libs/Ice/Ice-3.7.9999.ebuild | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild index 728e008..861267d 100644 --- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild +++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild @@ -28,14 +28,13 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0/36" KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug doc examples libressl +readline mono php python ruby test" +IUSE="debug doc examples +readline mono php python ruby test" RESTRICT="test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=">=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= || ( $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done) ) diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild index 24aa430..ccfe454 100644 --- a/dev-libs/Ice/Ice-3.6.9999.ebuild +++ b/dev-libs/Ice/Ice-3.6.9999.ebuild @@ -33,14 +33,13 @@ HOMEPAGE="https://zeroc.com/products/ice" LICENSE="GPL-2" SLOT="0/36" KEYWORDS="" -IUSE="debug examples libressl +readline mono php python ruby test" +IUSE="debug examples +readline mono php python ruby test" #RESTRICT="test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=">=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= || ( $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done) ) diff --git a/dev-libs/Ice/Ice-3.7.9999.ebuild b/dev-libs/Ice/Ice-3.7.9999.ebuild index 1b269ad..213056a 100644 --- a/dev-libs/Ice/Ice-3.7.9999.ebuild +++ b/dev-libs/Ice/Ice-3.7.9999.ebuild @@ -27,7 +27,7 @@ HOMEPAGE="https://zeroc.com/products/ice" LICENSE="GPL-2" SLOT="0/37" KEYWORDS="" -IUSE="debug examples libressl php python ruby test" +IUSE="debug examples php python ruby test" RESTRICT="test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -36,8 +36,7 @@ RDEPEND=">=app-arch/bzip2-1.0.5 dev-libs/libedit:= dev-cpp/libmcpp dev-db/lmdb - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= python? ( ${PYTHON_DEPS} ) ruby? ( $(ruby_implementation_depend ruby27) )" DEPEND="${RDEPEND}