commit:     5dc0801d3a2aab77c8c4285404113a3ae5ad3275
Author:     epsilonKNOT <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Nov 25 23:53:18 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> 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 <gentoo <AT> 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

Reply via email to