commit:     acc02dcb79219f1bcad38eef26e468636798c7f8
Author:     epsilonKNOT <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Nov 23 14:50:54 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Mon Nov 23 14:50:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=acc02dcb

net-libs/usockets: fix cstdlib include error

also fix direct CC and CXX calls

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 net-libs/usockets/Manifest                                        | 2 +-
 .../{usockets-0.6.0-r1.ebuild => usockets-0.6.0_p1.ebuild}        | 8 +++++---
 net-libs/usockets/usockets-9999.ebuild                            | 8 +++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 3e7ce58a..f999ba4b 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1 @@
-DIST usockets-0.6.0.tar.gz 57590 BLAKE2B 
8438a3d2a1861d995410fcda8b888d561de2fb51af319e58c529f1113cb8e4d0f821b1649618c28d43dbc64f28b6b4e90f7e0bd51fcabc5afdc8318ca8f21448
 SHA512 
0803a117334d4dc38b4936e6f1d34984a9fba30da1c360c3ff3d7ce14275a4ac9c4a4e7b407791fc3661c50be6b6a8335d26f808b21d0ade5f85ab721b14a500
+DIST usockets-0.6.0_p1.tar.gz 57634 BLAKE2B 
67faa23add9c88dd49eed4849766e3eeeeaedd3993741ced9491d01b6d0caf56b032a9689827018714dbc87b500f3755db4edacb035573f7a563cd7147b1e187
 SHA512 
0dbedc5e90af9a92e6597e801116b57fd99dcd5a8488e3b5ddce83bbcd1852d30f2c8954dc1991a807d32f00bdb62e654498687fec344d295f299ccf3920a1ca

diff --git a/net-libs/usockets/usockets-0.6.0-r1.ebuild 
b/net-libs/usockets/usockets-0.6.0_p1.ebuild
similarity index 83%
rename from net-libs/usockets/usockets-0.6.0-r1.ebuild
rename to net-libs/usockets/usockets-0.6.0_p1.ebuild
index 1d42acf6..1ebe7f13 100644
--- a/net-libs/usockets/usockets-0.6.0-r1.ebuild
+++ b/net-libs/usockets/usockets-0.6.0_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib
+inherit toolchain-funcs
 
 DESCRIPTION="tiny eventing, networking & crypto for async applications"
 HOMEPAGE="https://github.com/uNetworking/uSockets";
@@ -12,9 +12,10 @@ if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git";
 else
-       SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+       COMMIT=7683672d87067cd75b854f4e36b9820f4809a4be
+       
SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~arm64 ~x86"
-       S="${WORKDIR}/uSockets-${PV}"
+       S="${WORKDIR}/uSockets-${COMMIT}"
 fi
 
 LICENSE="Apache-2.0"
@@ -33,6 +34,7 @@ PATCHES=(
 )
 
 src_compile() {
+       tc-export CC CXX
        # the Makefile uses environment variables
        emake VERSION=${PV} \
              LIB="$(get_libdir)" \

diff --git a/net-libs/usockets/usockets-9999.ebuild 
b/net-libs/usockets/usockets-9999.ebuild
index 1d42acf6..1ebe7f13 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib
+inherit toolchain-funcs
 
 DESCRIPTION="tiny eventing, networking & crypto for async applications"
 HOMEPAGE="https://github.com/uNetworking/uSockets";
@@ -12,9 +12,10 @@ if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git";
 else
-       SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+       COMMIT=7683672d87067cd75b854f4e36b9820f4809a4be
+       
SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~arm64 ~x86"
-       S="${WORKDIR}/uSockets-${PV}"
+       S="${WORKDIR}/uSockets-${COMMIT}"
 fi
 
 LICENSE="Apache-2.0"
@@ -33,6 +34,7 @@ PATCHES=(
 )
 
 src_compile() {
+       tc-export CC CXX
        # the Makefile uses environment variables
        emake VERSION=${PV} \
              LIB="$(get_libdir)" \

Reply via email to