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 A35BE138334 for ; Sun, 17 Mar 2019 19:29:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FFF3E0A00; Sun, 17 Mar 2019 19:29:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 69EFFE0A00 for ; Sun, 17 Mar 2019 19:29:55 +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 2BCC2335D1A for ; Sun, 17 Mar 2019 19:29:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99CCA56A for ; Sun, 17 Mar 2019 19:29:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1552850976.2e5126c80778fd8fd03f4a444a8b681e8ab6f2f7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libzip/libzip-1.5.2.ebuild X-VCS-Directories: dev-libs/libzip/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2e5126c80778fd8fd03f4a444a8b681e8ab6f2f7 X-VCS-Branch: master Date: Sun, 17 Mar 2019 19:29:52 +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: 62d07f6a-8939-4815-a325-4542367855cf X-Archives-Hash: 44625fcabd59fb7ff1afae040a3161e0 commit: 2e5126c80778fd8fd03f4a444a8b681e8ab6f2f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 17 19:29:18 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 17 19:29:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5126c8 dev-libs/libzip: Actually fix cmake options Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/libzip/libzip-1.5.2.ebuild | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dev-libs/libzip/libzip-1.5.2.ebuild b/dev-libs/libzip/libzip-1.5.2.ebuild index 261eb19e86e..d34cd65a835 100644 --- a/dev-libs/libzip/libzip-1.5.2.ebuild +++ b/dev-libs/libzip/libzip-1.5.2.ebuild @@ -58,11 +58,25 @@ src_configure() { fi if use ssl; then - mycmakeargs+=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_MBEDTLS=$(usex mbedtls) - -DENABLE_OPENSSL=$(usex !gnutls) - ) + if use gnutls; then + mycmakeargs+=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_MBEDTLS=OFF + -DENABLE_OPENSSL=OFF + ) + elif use mbedtls; then + mycmakeargs+=( + -DENABLE_GNUTLS=OFF + -DENABLE_MBEDTLS=$(usex mbedtls) + -DENABLE_OPENSSL=OFF + ) + else + mycmakeargs+=( + -DENABLE_GNUTLS=OFF + -DENABLE_MBEDTLS=OFF + -DENABLE_OPENSSL=ON + ) + fi else mycmakeargs+=( -DENABLE_GNUTLS=OFF