From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE9A8138334 for ; Sat, 27 Apr 2019 20:29:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD71DE087B; Sat, 27 Apr 2019 20:28:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 855FCE087B for ; Sat, 27 Apr 2019 20:28:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA12D342A6F for ; Sat, 27 Apr 2019 20:28:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB1FE5D4 for ; Sat, 27 Apr 2019 20:28:54 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1556396872.354f82013dd455c6629fa35b1193464f45afeffb.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libssh2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libssh2/libssh2-1.8.0-r2.ebuild net-libs/libssh2/libssh2-1.8.2.ebuild net-libs/libssh2/libssh2-9999.ebuild X-VCS-Directories: net-libs/libssh2/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 354f82013dd455c6629fa35b1193464f45afeffb X-VCS-Branch: master Date: Sat, 27 Apr 2019 20:28:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c2268dba-b6c1-40f7-90f7-7f32024ec6dd X-Archives-Hash: 43215ddf8c2726a2019723ac0b17b522 commit: 354f82013dd455c6629fa35b1193464f45afeffb Author: David Seifert gentoo org> AuthorDate: Sat Apr 27 16:35:04 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Apr 27 20:27:52 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354f8201 net-libs/libssh2: [QA] Fix USE=libressl semantics Closes: https://bugs.gentoo.org/684000 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: David Seifert gentoo.org> net-libs/libssh2/libssh2-1.8.0-r2.ebuild | 16 +++++++++------- net-libs/libssh2/libssh2-1.8.2.ebuild | 14 ++++++++------ net-libs/libssh2/libssh2-9999.ebuild | 14 ++++++++------ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r2.ebuild index bdab253bbee..7eb5156df2c 100644 --- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild +++ b/net-libs/libssh2/libssh2-1.8.0-r2.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 @@ -12,16 +12,18 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="gcrypt libressl mbedtls zlib" -REQUIRED_USE=" - ?? ( gcrypt libressl mbedtls ) -" +REQUIRED_USE="?? ( gcrypt mbedtls )" RESTRICT="test" RDEPEND=" - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + !gcrypt? ( + mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + !mbedtls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + ) + ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND=" diff --git a/net-libs/libssh2/libssh2-1.8.2.ebuild b/net-libs/libssh2/libssh2-1.8.2.ebuild index 75e39f52b68..7eb5156df2c 100644 --- a/net-libs/libssh2/libssh2-1.8.2.ebuild +++ b/net-libs/libssh2/libssh2-1.8.2.ebuild @@ -12,16 +12,18 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" IUSE="gcrypt libressl mbedtls zlib" -REQUIRED_USE=" - ?? ( gcrypt libressl mbedtls ) -" +REQUIRED_USE="?? ( gcrypt mbedtls )" RESTRICT="test" RDEPEND=" - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + !gcrypt? ( + mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + !mbedtls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + ) + ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND=" diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild index 456ca920385..d1797b7dcfa 100644 --- a/net-libs/libssh2/libssh2-9999.ebuild +++ b/net-libs/libssh2/libssh2-9999.ebuild @@ -12,16 +12,18 @@ LICENSE="BSD" SLOT="0" KEYWORDS="" IUSE="gcrypt libressl mbedtls zlib" -REQUIRED_USE=" - ?? ( gcrypt libressl mbedtls ) -" +REQUIRED_USE="?? ( gcrypt mbedtls )" RESTRICT="test" RDEPEND=" - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + !gcrypt? ( + mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] ) + !mbedtls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + ) + ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="