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 D812A13835A for ; Thu, 26 Nov 2020 12:10:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13A3EE095A; Thu, 26 Nov 2020 12:10: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 F1679E095A for ; Thu, 26 Nov 2020 12:10:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 33839341354 for ; Thu, 26 Nov 2020 12:10:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B807B472 for ; Thu, 26 Nov 2020 12:10:49 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1606348398.5dc0801d3a2aab77c8c4285404113a3ae5ad3275.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-libs/usockets/usockets-0.6.0_p1-r1.ebuild net-libs/usockets/usockets-0.6.0_p1.ebuild net-libs/usockets/usockets-9999.ebuild X-VCS-Directories: net-libs/usockets/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 5dc0801d3a2aab77c8c4285404113a3ae5ad3275 X-VCS-Branch: master Date: Thu, 26 Nov 2020 12:10:49 +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: 22344cd2-22b1-4214-8f2e-47ba0f9b3e15 X-Archives-Hash: fbcb21463559da79061443a2a62a462c commit: 5dc0801d3a2aab77c8c4285404113a3ae5ad3275 Author: epsilonKNOT aisha cc> AuthorDate: Wed Nov 25 23:53:18 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Nov 25 23:53:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5dc0801d net-libs/usockets: allow linking libressl Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Aisha Tammy aisha.cc> ...-0.6.0_p1.ebuild => usockets-0.6.0_p1-r1.ebuild} | 21 +++++++++++---------- net-libs/usockets/usockets-9999.ebuild | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/net-libs/usockets/usockets-0.6.0_p1.ebuild b/net-libs/usockets/usockets-0.6.0_p1-r1.ebuild similarity index 74% rename from net-libs/usockets/usockets-0.6.0_p1.ebuild rename to net-libs/usockets/usockets-0.6.0_p1-r1.ebuild index 1ebe7f13..bdd890be 100644 --- a/net-libs/usockets/usockets-0.6.0_p1.ebuild +++ b/net-libs/usockets/usockets-0.6.0_p1-r1.ebuild @@ -20,10 +20,11 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="libuv +ssl static-libs" +IUSE="libuv libressl +ssl static-libs" DEPEND="ssl? ( - >=dev-libs/openssl-1.1.0:=[static-libs?] + !libressl? ( >=dev-libs/openssl-1.1.0[static-libs?] ) + libressl? ( dev-libs/libressl[static-libs?] ) ) libuv? ( dev-libs/libuv[static-libs?] ) " @@ -37,18 +38,18 @@ src_compile() { tc-export CC CXX # the Makefile uses environment variables emake VERSION=${PV} \ - LIB="$(get_libdir)" \ - WITH_OPENSSL=$(usex ssl 1 0) \ - WITH_LIBUV=$(usex libuv 1 0) \ - default + LIB="$(get_libdir)" \ + WITH_OPENSSL=$(usex ssl 1 0) \ + WITH_LIBUV=$(usex libuv 1 0) \ + default } src_install() { emake LIB="$(get_libdir)" \ - prefix="${EPREFIX%/}/usr" \ - DESTDIR="${D}" \ - VERSION=${PV} \ - install + prefix="${EPREFIX%/}/usr" \ + DESTDIR="${D}" \ + VERSION=${PV} \ + install einstalldocs if ! use static-libs; then rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild index 1ebe7f13..bdd890be 100644 --- a/net-libs/usockets/usockets-9999.ebuild +++ b/net-libs/usockets/usockets-9999.ebuild @@ -20,10 +20,11 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="libuv +ssl static-libs" +IUSE="libuv libressl +ssl static-libs" DEPEND="ssl? ( - >=dev-libs/openssl-1.1.0:=[static-libs?] + !libressl? ( >=dev-libs/openssl-1.1.0[static-libs?] ) + libressl? ( dev-libs/libressl[static-libs?] ) ) libuv? ( dev-libs/libuv[static-libs?] ) " @@ -37,18 +38,18 @@ src_compile() { tc-export CC CXX # the Makefile uses environment variables emake VERSION=${PV} \ - LIB="$(get_libdir)" \ - WITH_OPENSSL=$(usex ssl 1 0) \ - WITH_LIBUV=$(usex libuv 1 0) \ - default + LIB="$(get_libdir)" \ + WITH_OPENSSL=$(usex ssl 1 0) \ + WITH_LIBUV=$(usex libuv 1 0) \ + default } src_install() { emake LIB="$(get_libdir)" \ - prefix="${EPREFIX%/}/usr" \ - DESTDIR="${D}" \ - VERSION=${PV} \ - install + prefix="${EPREFIX%/}/usr" \ + DESTDIR="${D}" \ + VERSION=${PV} \ + install einstalldocs if ! use static-libs; then rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die