subject:"\[gentoo\-commits\] repo\/proj\/guru\:dev commit in\: net\-libs\/usockets\/"

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2024-05-16 Thread Aisha Tammy

commit: 33ef812fc3ce63beef00b7295fd094a17344ad8e
Author: Aisha Tammy  aisha  cc>
AuthorDate: Tue May  7 22:15:22 2024 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Thu May 16 16:40:50 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=33ef812f

net-libs/usockets: fix dependency on asio

Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/usockets-0.8.8.ebuild | 2 +-
 net-libs/usockets/usockets-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/usockets/usockets-0.8.8.ebuild 
b/net-libs/usockets/usockets-0.8.8.ebuild
index 16f5febb9c..328d32ea95 100644
--- a/net-libs/usockets/usockets-0.8.8.ebuild
+++ b/net-libs/usockets/usockets-0.8.8.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-   asio? ( dev-cpp/asio:=[ssl(+)?] )
+   asio? ( dev-cpp/asio:= )
libuv? ( dev-libs/libuv )
ssl? ( >=dev-libs/openssl-1.1.0 )
 "

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 16f5febb9c..328d32ea95 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-   asio? ( dev-cpp/asio:=[ssl(+)?] )
+   asio? ( dev-cpp/asio:= )
libuv? ( dev-libs/libuv )
ssl? ( >=dev-libs/openssl-1.1.0 )
 "

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2024-04-30 Thread David Roman

commit: f3fb1ff6617a726290fd637bd4dc930cce1706c6
Author: David Roman  gmail  com>
AuthorDate: Wed May  1 01:44:42 2024 +
Commit: David Roman  gmail  com>
CommitDate: Wed May  1 01:44:42 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f3fb1ff6

net-libs/usockets: fix wrong dep slot operator usage

Signed-off-by: David Roman  gmail.com>

 net-libs/usockets/usockets-0.8.8.ebuild | 2 +-
 net-libs/usockets/usockets-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/usockets/usockets-0.8.8.ebuild 
b/net-libs/usockets/usockets-0.8.8.ebuild
index 07a9276ef2..16f5febb9c 100644
--- a/net-libs/usockets/usockets-0.8.8.ebuild
+++ b/net-libs/usockets/usockets-0.8.8.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-   asio? ( dev-cpp/asio[ssl(+)?]:= )
+   asio? ( dev-cpp/asio:=[ssl(+)?] )
libuv? ( dev-libs/libuv )
ssl? ( >=dev-libs/openssl-1.1.0 )
 "

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 07a9276ef2..16f5febb9c 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-   asio? ( dev-cpp/asio[ssl(+)?]:= )
+   asio? ( dev-cpp/asio:=[ssl(+)?] )
libuv? ( dev-libs/libuv )
ssl? ( >=dev-libs/openssl-1.1.0 )
 "

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2024-04-30 Thread Aisha Tammy

commit: e720d4940d1b0d4adca22d3e5f5f4d5acccb59ee
Author: Aisha Tammy  aisha  cc>
AuthorDate: Tue Apr 30 23:55:13 2024 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Tue Apr 30 23:55:16 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e720d494

net-libs/usockets: drop 0.8.1_p20211023

Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest|  1 -
 net-libs/usockets/usockets-0.8.1_p20211023.ebuild | 55 ---
 2 files changed, 56 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index c4055eecc2..4cd9130fc7 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.8.1_p20211023.tar.gz 66346 BLAKE2B 
1833d1d3981fd5cf7f48794b183426341d7dd0b36654a528335c61a2495a59e54bad6f634ec14ccf8b33895091cc48306d7d7b90031888ba661a2db8019f30e9
 SHA512 
146c130731ac8f071f339e71c8cd45f319e837d333a36c6f578a2d7d9546267660ad0d3f82505d3f5d33b0494ec26b2d7b7eba3756d62ecc883b1afbf6c5bfb2
 DIST usockets-0.8.8.tar.gz 90860 BLAKE2B 
9a0886cf9446e67d8026419b353472d68f74045346c9e92b7ebb4f626580e1150ec555e6b56fbfad217ef38cc3b2c9d6148743033d0e42839eca998294393935
 SHA512 
726b1665209d0006d6621352c12019bbab22bed75450c5ef1509b409d3c19c059caf94775439d3b910676fa2a4a790d490c3e25e5b8141423d88823642be7ac7

diff --git a/net-libs/usockets/usockets-0.8.1_p20211023.ebuild 
b/net-libs/usockets/usockets-0.8.1_p20211023.ebuild
deleted file mode 100644
index 58b0422a0b..00
--- a/net-libs/usockets/usockets-0.8.1_p20211023.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="tiny eventing, networking & crypto for async applications"
-HOMEPAGE="https://github.com/uNetworking/uSockets";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git";
-else
-   COMMIT="c2c1bbfa1644f1f6eb7fc9375650f41c5f9b7b06"
-   
SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-   S="${WORKDIR}/uSockets-${COMMIT}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="asio libuv +ssl test"
-REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   asio? ( dev-cpp/asio[ssl(+)?] )
-   libuv? ( dev-libs/libuv )
-   ssl? ( >=dev-libs/openssl-1.1.0 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.8.1_p20211023-Makefile.patch"
-   "${FILESDIR}/${PN}-0.8.1_p20211023-pkg-config.patch"
-   "${FILESDIR}/${PN}-0.8.1_p20211023-gen-ssl-config.patch"
-   "${FILESDIR}/${PN}-0.8.1_p20211023-hammer-test.patch"
-)
-
-src_configure() {
-   tc-export CC CXX AR
-   export VERSION="${PV%_*}" \
-  LIB="$(get_libdir)" \
-  WITH_OPENSSL="$(usex ssl 1 0)" \
-  WITH_LIBUV="$(usex libuv 1 0)" \
-  WITH_ASIO="$(usex asio 1 0)"
-   default
-}
-
-src_install() {
-   default
-   einstalldocs
-   rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
-}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

2024-04-30 Thread Aisha Tammy

commit: 7c5af05fefeba5081e616ef27362d2f080f909c9
Author: Aisha Tammy  aisha  cc>
AuthorDate: Tue Apr 30 23:54:25 2024 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Tue Apr 30 23:54:38 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c5af05f

net-libs/usockets: update to 0.8.8

Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest |   1 +
 .../usockets/files/usockets-0.8.8-Makefile.patch   | 172 +
 .../files/usockets-0.8.8-hammer-test.patch |  16 ++
 ...{usockets-.ebuild => usockets-0.8.8.ebuild} |  11 +-
 net-libs/usockets/usockets-.ebuild |  11 +-
 5 files changed, 199 insertions(+), 12 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index ff0b57d33f..c4055eecc2 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.8.1_p20211023.tar.gz 66346 BLAKE2B 
1833d1d3981fd5cf7f48794b183426341d7dd0b36654a528335c61a2495a59e54bad6f634ec14ccf8b33895091cc48306d7d7b90031888ba661a2db8019f30e9
 SHA512 
146c130731ac8f071f339e71c8cd45f319e837d333a36c6f578a2d7d9546267660ad0d3f82505d3f5d33b0494ec26b2d7b7eba3756d62ecc883b1afbf6c5bfb2
+DIST usockets-0.8.8.tar.gz 90860 BLAKE2B 
9a0886cf9446e67d8026419b353472d68f74045346c9e92b7ebb4f626580e1150ec555e6b56fbfad217ef38cc3b2c9d6148743033d0e42839eca998294393935
 SHA512 
726b1665209d0006d6621352c12019bbab22bed75450c5ef1509b409d3c19c059caf94775439d3b910676fa2a4a790d490c3e25e5b8141423d88823642be7ac7

diff --git a/net-libs/usockets/files/usockets-0.8.8-Makefile.patch 
b/net-libs/usockets/files/usockets-0.8.8-Makefile.patch
new file mode 100644
index 00..6fe86246e4
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.8.8-Makefile.patch
@@ -0,0 +1,172 @@
+diff --git a/Makefile b/Makefile
+index aa874b9..13f9b34 100644
+--- a/Makefile
 b/Makefile
+@@ -1,109 +1,90 @@
+-# By default we use LTO, but Windows does not support it
+-ifneq ($(WITH_LTO),0)
+-  override CFLAGS += -flto
+-endif
++VERSION ?=0.0
+ 
+-# WITH_BORINGSSL=1 enables BoringSSL support, linked statically (preferred 
over OpenSSL)
+-# You need to call "make boringssl" before
+-ifeq ($(WITH_BORINGSSL),1)
+-  override CFLAGS += -Iboringssl/include -pthread -DLIBUS_USE_OPENSSL
+-  override LDFLAGS += -pthread boringssl/build/ssl/libssl.a 
boringssl/build/crypto/libcrypto.a -lstdc++
+-else
+-  # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+-  # For now we need to link with C++ for OpenSSL support, but should be 
removed with time
+-  ifeq ($(WITH_OPENSSL),1)
+-  override CFLAGS += -DLIBUS_USE_OPENSSL
+-  # With problems on macOS, make sure to pass needed LDFLAGS 
required to find these
+-  override LDFLAGS += -lssl -lcrypto -lstdc++
+-  else
+-  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually 
exclusive with OpenSSL)
+-  ifeq ($(WITH_WOLFSSL),1)
+-  # todo: change these
+-  override CFLAGS += -DLIBUS_USE_WOLFSSL 
-I/usr/local/include
+-  override LDFLAGS += -L/usr/local/lib -lwolfssl
+-  else
+-  override CFLAGS += -DLIBUS_NO_SSL
+-  endif
+-  endif
+-endif
++PREFIX ?= /usr
++LIB ?=lib
++LIBDIR ?= $(PREFIX)/$(LIB)
++INCDIR ?= $(PREFIX)/include
+ 
+-# WITH_IO_URING=1 builds with io_uring as event-loop and network 
implementation
+-ifeq ($(WITH_IO_URING),1)
+-  override CFLAGS += -DLIBUS_USE_IO_URING
+-  # override LDFLAGS += -l
++PKG_CONFIG ?= pkg-config
++
++LIBTARGET =   libusockets.so
++LIBTARGETV =  $(LIBTARGET).$(VERSION)
++
++REQUIRES =
++COMMON_FLAGS =-fPIC -Isrc
++
++# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
++# For now we need to link with C++ for OpenSSL support, but should be removed 
with time
++ifeq ($(WITH_OPENSSL),1)
++COMMON_FLAGS +=   -DLIBUS_USE_OPENSSL
++REQUIRES +=   libssl libcrypto
+ endif
+ 
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+-  override CFLAGS += -DLIBUS_USE_LIBUV
+-  override LDFLAGS += -luv
+-endif
+-
+-# WITH_ASIO builds with boot asio event-loop
+-ifeq ($(WITH_ASIO),1)
+-  override CFLAGS += -DLIBUS_USE_ASIO
+-  override LDFLAGS += -lstdc++ -lpthread
+-  override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
++COMMON_FLAGS +=   -DLIBUS_USE_LIBUV
++REQUIRES +=   libuv
+ endif
+ 
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+-  override CFLAGS += -DLIBUS_USE_GCD
+-  override LDFLAGS += -framework CoreFoundation
++# WITH_IO_URING=1 builds with io_uring as event-loop and network 
implementation
++ifeq ($(WITH_IO_URING),1)
++COMMON_FLAGS +=   -DLIBUS_USE_IO_URING
++REQUIRES +=   liburing
+ endif
+ 
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+-  override CFLAGS += -fsanitize=address -g
+-  overri

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

2021-10-25 Thread Aisha Tammy

commit: 3c722132a92c17fb09e2ff5d46229c26d4caf0c6
Author: Aisha Tammy  aisha  cc>
AuthorDate: Mon Oct 25 03:51:27 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Mon Oct 25 03:51:27 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c722132

net-libs/usockets: version bump to 0.8.1

enable tests
tests fail with asio but pass with either
libuv or no flag (default epoll)

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest |   2 +-
 .../files/usockets-0.7.1_p20210909-Makefile.patch  | 138 
 .../files/usockets-0.8.1_p20211023-Makefile.patch  | 141 +
 .../usockets-0.8.1_p20211023-gen-ssl-config.patch  |  14 ++
 .../usockets-0.8.1_p20211023-hammer-test.patch |  16 +++
 .../usockets-0.8.1_p20211023-pkg-config.patch  |  18 +++
 ...0909.ebuild => usockets-0.8.1_p20211023.ebuild} |  12 +-
 net-libs/usockets/usockets-.ebuild |  12 +-
 8 files changed, 206 insertions(+), 147 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 84b397210..ff0b57d33 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1 @@
-DIST usockets-0.7.1_p20210909.tar.gz 65495 BLAKE2B 
23aeb6ec3c330926aa375f0dedf4eb0e63f89fd833145cc3af47936de8ffa2139273710eee7019c2f5c12d7715746a38a6b64a3e48a349a2893599116ca623d8
 SHA512 
29bac37a75172cdb2881b27d142972a235470e8e0ec85e98c1bfd5f587ab1f777001e69a57bfc46b87a74bf73f4a166300e42e9f0ed908810bcf5c46290abdce
+DIST usockets-0.8.1_p20211023.tar.gz 66346 BLAKE2B 
1833d1d3981fd5cf7f48794b183426341d7dd0b36654a528335c61a2495a59e54bad6f634ec14ccf8b33895091cc48306d7d7b90031888ba661a2db8019f30e9
 SHA512 
146c130731ac8f071f339e71c8cd45f319e837d333a36c6f578a2d7d9546267660ad0d3f82505d3f5d33b0494ec26b2d7b7eba3756d62ecc883b1afbf6c5bfb2

diff --git a/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch 
b/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
deleted file mode 100644
index d8efed76f..0
--- a/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b809ac0..857a1f7 100644
 a/Makefile
-+++ b/Makefile
-@@ -1,72 +1,69 @@
-+DESTDIR ?=
-+
-+prefix ?= /usr
-+exec_prefix ?=$(prefix)
-+LIB ?=lib
-+libdir ?= $(exec_prefix)/$(LIB)
-+includedir ?= $(exec_prefix)/include
-+
-+PKG_CONFIG ?= pkg-config
-+
-+VERSION ?=0.0
-+LIBTARGET =   libusockets.so.$(VERSION)
-+
-+REQUIRES =
-+COMMON_FLAGS =-fPIC -Isrc
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
- # For now we need to link with C++ for OpenSSL support, but should be removed 
with time
- ifeq ($(WITH_OPENSSL),1)
--  override CFLAGS += -DLIBUS_USE_OPENSSL
--  # With problems on macOS, make sure to pass needed LDFLAGS required to 
find these
--  override LDFLAGS += -lssl -lcrypto -lstdc++
--else
--  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
OpenSSL)
--  ifeq ($(WITH_WOLFSSL),1)
--  # todo: change these
--  override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
--  override LDFLAGS += -L/usr/local/lib -lwolfssl
--  else
--  override CFLAGS += -DLIBUS_NO_SSL
--  endif
-+COMMON_FLAGS +=   -DLIBUS_USE_OPENSSL
-+LDFLAGS +=-lssl -lcrypto -lstdc++
-+REQUIRES +=   libssl libcrypto
- endif
- 
- # WITH_LIBUV=1 builds with libuv as event-loop
- ifeq ($(WITH_LIBUV),1)
--  override CFLAGS += -DLIBUS_USE_LIBUV
--  override LDFLAGS += -luv
-+COMMON_FLAGS +=   -DLIBUS_USE_LIBUV
-+REQUIRES +=   libuv
- endif
- 
--# WITH_ASIO builds with boot asio event-loop
-+# WITH_ASIO builds with boost asio event-loop
- ifeq ($(WITH_ASIO),1)
--  override CFLAGS += -DLIBUS_USE_ASIO
--  override LDFLAGS += -lstdc++ -lpthread
--  override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
-+COMMON_FLAGS +=   -pthread -DLIBUS_USE_ASIO
- endif
- 
--# WITH_GCD=1 builds with libdispatch as event-loop
--ifeq ($(WITH_GCD),1)
--  override CFLAGS += -DLIBUS_USE_GCD
--  override LDFLAGS += -framework CoreFoundation
--endif
--
--# WITH_ASAN builds with sanitizers
--ifeq ($(WITH_ASAN),1)
--  override CFLAGS += -fsanitize=address -g
--  override LDFLAGS += -fsanitize=address
--endif
--
--override CFLAGS += -std=c11 -Isrc
--override LDFLAGS += uSockets.a
-+CFLAGS += -std=c11 $(COMMON_FLAGS)
-+CXXFLAGS +=   -std=c++17 $(COMMON_FLAGS)
- 
- # By default we build the uSockets.a static library
- default:
--  rm -f *.o
--  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
-+  $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
- # Also link in Boost Asio support
- ifeq ($(WITH_ASIO),1)
--  $(CXX) $(CXXFLAGS) -Isrc -std=c++14 -flto -O3 -c src/eventing/asio.cpp
-+  $(CXX) $(CXXFLAGS) -c src/eventing

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-09-21 Thread Arthur Zamarin

commit: 3c0454efa84f198151cf03736b1fad38dff894c6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Sep 21 09:46:48 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Sep 21 09:46:48 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c0454ef

net-libs/usockets: fix missing use dep default

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-libs/usockets/usockets-0.7.1_p20210909.ebuild | 2 +-
 net-libs/usockets/usockets-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/usockets/usockets-0.7.1_p20210909.ebuild 
b/net-libs/usockets/usockets-0.7.1_p20210909.ebuild
index 3de0636c4..5c5a33ead 100644
--- a/net-libs/usockets/usockets-0.7.1_p20210909.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210909.ebuild
@@ -24,7 +24,7 @@ IUSE="asio libuv +ssl"
 REQUIRED_USE="?? ( asio libuv )"
 
 DEPEND="
-   asio? ( dev-cpp/asio[ssl?] )
+   asio? ( dev-cpp/asio[ssl(+)?] )
libuv? ( dev-libs/libuv )
ssl? ( >=dev-libs/openssl-1.1.0 )
 "

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 3de0636c4..5c5a33ead 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -24,7 +24,7 @@ IUSE="asio libuv +ssl"
 REQUIRED_USE="?? ( asio libuv )"
 
 DEPEND="
-   asio? ( dev-cpp/asio[ssl?] )
+   asio? ( dev-cpp/asio[ssl(+)?] )
libuv? ( dev-libs/libuv )
ssl? ( >=dev-libs/openssl-1.1.0 )
 "

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

2021-09-09 Thread Aisha Tammy

commit: c28c5380044fd703e28d2a45b18ef9e078551db9
Author: Aisha Tammy  aisha  cc>
AuthorDate: Thu Sep  9 16:12:44 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Thu Sep  9 16:12:44 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c28c5380

net-libs/usockets: version bump to latest commit

adds new optional dependency on dev-cpp/asio

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest |   1 +
 .../files/usockets-0.7.1_p20210909-Makefile.patch  | 138 +
 net-libs/usockets/metadata.xml |   1 +
 ....ebuild => usockets-0.7.1_p20210909.ebuild} |  16 ++-
 net-libs/usockets/usockets-.ebuild |  16 ++-
 5 files changed, 160 insertions(+), 12 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index aef4019f1..7f03a5189 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.7.1_p20210214.tar.gz 62372 BLAKE2B 
2853792af6f86954d7920cd33936ddd586cdeb9149dbffd0687b3bbc0965526d28c363864398d17182df9e038c35dc384271f01e72f7a60189319b9e820de3cb
 SHA512 
d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11
+DIST usockets-0.7.1_p20210909.tar.gz 65495 BLAKE2B 
23aeb6ec3c330926aa375f0dedf4eb0e63f89fd833145cc3af47936de8ffa2139273710eee7019c2f5c12d7715746a38a6b64a3e48a349a2893599116ca623d8
 SHA512 
29bac37a75172cdb2881b27d142972a235470e8e0ec85e98c1bfd5f587ab1f777001e69a57bfc46b87a74bf73f4a166300e42e9f0ed908810bcf5c46290abdce

diff --git a/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch 
b/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
new file mode 100644
index 0..d8efed76f
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
@@ -0,0 +1,138 @@
+diff --git a/Makefile b/Makefile
+index b809ac0..857a1f7 100644
+--- a/Makefile
 b/Makefile
+@@ -1,72 +1,69 @@
++DESTDIR ?=
++
++prefix ?= /usr
++exec_prefix ?=$(prefix)
++LIB ?=lib
++libdir ?= $(exec_prefix)/$(LIB)
++includedir ?= $(exec_prefix)/include
++
++PKG_CONFIG ?= pkg-config
++
++VERSION ?=0.0
++LIBTARGET =   libusockets.so.$(VERSION)
++
++REQUIRES =
++COMMON_FLAGS =-fPIC -Isrc
++
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
+ # For now we need to link with C++ for OpenSSL support, but should be removed 
with time
+ ifeq ($(WITH_OPENSSL),1)
+-  override CFLAGS += -DLIBUS_USE_OPENSSL
+-  # With problems on macOS, make sure to pass needed LDFLAGS required to 
find these
+-  override LDFLAGS += -lssl -lcrypto -lstdc++
+-else
+-  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
OpenSSL)
+-  ifeq ($(WITH_WOLFSSL),1)
+-  # todo: change these
+-  override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
+-  override LDFLAGS += -L/usr/local/lib -lwolfssl
+-  else
+-  override CFLAGS += -DLIBUS_NO_SSL
+-  endif
++COMMON_FLAGS +=   -DLIBUS_USE_OPENSSL
++LDFLAGS +=-lssl -lcrypto -lstdc++
++REQUIRES +=   libssl libcrypto
+ endif
+ 
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+-  override CFLAGS += -DLIBUS_USE_LIBUV
+-  override LDFLAGS += -luv
++COMMON_FLAGS +=   -DLIBUS_USE_LIBUV
++REQUIRES +=   libuv
+ endif
+ 
+-# WITH_ASIO builds with boot asio event-loop
++# WITH_ASIO builds with boost asio event-loop
+ ifeq ($(WITH_ASIO),1)
+-  override CFLAGS += -DLIBUS_USE_ASIO
+-  override LDFLAGS += -lstdc++ -lpthread
+-  override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
++COMMON_FLAGS +=   -pthread -DLIBUS_USE_ASIO
+ endif
+ 
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+-  override CFLAGS += -DLIBUS_USE_GCD
+-  override LDFLAGS += -framework CoreFoundation
+-endif
+-
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+-  override CFLAGS += -fsanitize=address -g
+-  override LDFLAGS += -fsanitize=address
+-endif
+-
+-override CFLAGS += -std=c11 -Isrc
+-override LDFLAGS += uSockets.a
++CFLAGS += -std=c11 $(COMMON_FLAGS)
++CXXFLAGS +=   -std=c++17 $(COMMON_FLAGS)
+ 
+ # By default we build the uSockets.a static library
+ default:
+-  rm -f *.o
+-  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
++  $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
+ # Also link in Boost Asio support
+ ifeq ($(WITH_ASIO),1)
+-  $(CXX) $(CXXFLAGS) -Isrc -std=c++14 -flto -O3 -c src/eventing/asio.cpp
++  $(CXX) $(CXXFLAGS) -c src/eventing/asio.cpp
+ endif
+-
+-# For now we do rely on C++17 for OpenSSL support but we will be porting this 
work to C11
+ ifeq ($(WITH_OPENSSL),1)
+-  $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
++  $(CXX) $(CXXFLAGS) -c sr

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

2021-09-09 Thread Aisha Tammy

commit: 23815a296438a9a87459b086bafcfed6d66e696d
Author: Aisha Tammy  aisha  cc>
AuthorDate: Thu Sep  9 16:13:12 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Thu Sep  9 16:13:12 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=23815a29

net-libs/usockets: drop old version

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest |   1 -
 .../usockets/files/usockets-0.7.1-Makefile.patch   | 124 -
 .../usockets/usockets-0.7.1_p20210214-r2.ebuild|  48 
 3 files changed, 173 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 7f03a5189..84b397210 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.7.1_p20210214.tar.gz 62372 BLAKE2B 
2853792af6f86954d7920cd33936ddd586cdeb9149dbffd0687b3bbc0965526d28c363864398d17182df9e038c35dc384271f01e72f7a60189319b9e820de3cb
 SHA512 
d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11
 DIST usockets-0.7.1_p20210909.tar.gz 65495 BLAKE2B 
23aeb6ec3c330926aa375f0dedf4eb0e63f89fd833145cc3af47936de8ffa2139273710eee7019c2f5c12d7715746a38a6b64a3e48a349a2893599116ca623d8
 SHA512 
29bac37a75172cdb2881b27d142972a235470e8e0ec85e98c1bfd5f587ab1f777001e69a57bfc46b87a74bf73f4a166300e42e9f0ed908810bcf5c46290abdce

diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch 
b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
deleted file mode 100644
index 2d3a47d29..0
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9b54cac..a610bcc 100644
 a/Makefile
-+++ b/Makefile
-@@ -1,60 +1,59 @@
-+DESTDIR ?=
-+
-+prefix ?= /usr
-+exec_prefix ?=$(prefix)
-+LIB ?=lib
-+libdir ?= $(exec_prefix)/$(LIB)
-+includedir ?= $(exec_prefix)/include
-+
-+PKG_CONFIG ?= pkg-config
-+
-+VERSION ?=0.0
-+LIBTARGET =   libusockets.so.$(VERSION)
-+
-+REQUIRES =
-+COMMON_FLAGS =-Isrc
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
- # For now we need to link with C++ for OpenSSL support, but should be removed 
with time
- ifeq ($(WITH_OPENSSL),1)
--  override CFLAGS += -DLIBUS_USE_OPENSSL
--  # With problems on macOS, make sure to pass needed LDFLAGS required to 
find these
--  override LDFLAGS += -lssl -lcrypto -lstdc++
--else
--  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
OpenSSL)
--  ifeq ($(WITH_WOLFSSL),1)
--  # todo: change these
--  override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
--  override LDFLAGS += -L/usr/local/lib -lwolfssl
--  else
--  override CFLAGS += -DLIBUS_NO_SSL
--  endif
-+COMMON_FLAGS +=   -DLIBUS_USE_OPENSSL
-+LDFLAGS +=-lssl -lcrypto -lstdc++
-+REQUIRES +=   libssl libcrypto
- endif
- 
- # WITH_LIBUV=1 builds with libuv as event-loop
- ifeq ($(WITH_LIBUV),1)
--  override CFLAGS += -DLIBUS_USE_LIBUV
--  override LDFLAGS += -luv
-+COMMON_FLAGS +=   -DLIBUS_USE_LIBUV
-+REQUIRES +=   libuv
- endif
- 
--# WITH_GCD=1 builds with libdispatch as event-loop
--ifeq ($(WITH_GCD),1)
--  override CFLAGS += -DLIBUS_USE_GCD
--  override LDFLAGS += -framework CoreFoundation
--endif
-+CFLAGS += -std=c11 $(COMMON_FLAGS)
-+CXXFLAGS +=   -std=c++17 $(COMMON_FLAGS)
- 
--# WITH_ASAN builds with sanitizers
--ifeq ($(WITH_ASAN),1)
--  override CFLAGS += -fsanitize=address -g
--  override LDFLAGS += -fsanitize=address
--endif
--
--override CFLAGS += -std=c11 -Isrc
--override LDFLAGS += uSockets.a
--
--# By default we build the uSockets.a static library
- default:
--  rm -f *.o
--  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
--# For now we do rely on C++17 for OpenSSL support but we will be porting this 
work to C11
-+  $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
- ifeq ($(WITH_OPENSSL),1)
--  $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
-+  $(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
- endif
--  $(AR) rvs uSockets.a *.o
--
--# Builds all examples
--.PHONY: examples
--examples: default
--  for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename 
"$$f" ".c") "$$f" $(LDFLAGS); done
--
--swift_examples:
--  swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o 
swift_http_server
-+  $(AR) rvs libusockets.a *.o
-+  $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) 
`$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
-+  sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+  -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > 
libusockets.pc
-+
-+install:
-+  install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-06-08 Thread Theo Anderson

commit: 7b981a0a91c05fc554d00e1108ff6890e6c60be5
Author: Theo Anderson  posteo  de>
AuthorDate: Wed Jun  9 03:21:50 2021 +
Commit: Theo Anderson  posteo  de>
CommitDate: Wed Jun  9 03:21:50 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7b981a0a

net-libs/usockets: drop static-libs

Signed-off-by: Theo Anderson  posteo.de>

 net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild | 10 --
 net-libs/usockets/usockets-.ebuild   | 10 --
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild 
b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
index d7d107c8c..0e1f15d5b 100644
--- a/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
@@ -20,11 +20,11 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="libuv +ssl static-libs"
+IUSE="libuv +ssl"
 
 DEPEND="
-   libuv? ( dev-libs/libuv[static-libs(-)?] )
-   ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
+   libuv? ( dev-libs/libuv )
+   ssl? ( >=dev-libs/openssl-1.1.0 )
 "
 RDEPEND="${DEPEND}"
 
@@ -44,7 +44,5 @@ src_configure() {
 src_install() {
default
einstalldocs
-   if ! use static-libs; then
-   rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
-   fi
+   rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
 }

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index e40b7ed25..c08a9ad93 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -19,11 +19,11 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="libuv +ssl static-libs"
+IUSE="libuv +ssl"
 
 DEPEND="
-   libuv? ( dev-libs/libuv[static-libs(-)?] )
-   ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
+   libuv? ( dev-libs/libuv )
+   ssl? ( >=dev-libs/openssl-1.1.0 )
 "
 RDEPEND="${DEPEND}"
 
@@ -43,7 +43,5 @@ src_configure() {
 src_install() {
default
einstalldocs
-   if ! use static-libs; then
-   rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
-   fi
+   rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
 }

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

2021-05-11 Thread Aisha Tammy

commit: 351a7a9324f55ed3633ca1a3350701b188d4dabb
Author: Aisha Tammy  bsd  ac>
AuthorDate: Tue May 11 13:47:51 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Tue May 11 13:48:25 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=351a7a93

net-libs/usockets: rename pkgconfig file

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy  bsd.ac>

 net-libs/usockets/files/usockets-0.7.1-Makefile.patch | 8 
 ...7.1_p20210214-r1.ebuild => usockets-0.7.1_p20210214-r2.ebuild} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch 
b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
index f1ed03b5a..2d3a47d29 100644
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -86,7 +86,7 @@ index 9b54cac..a610bcc 100644
 +  $(AR) rvs libusockets.a *.o
 +  $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) 
`$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
 +  sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+  -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" usockets.pc.in > 
usockets.pc
++  -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > 
libusockets.pc
 +
 +install:
 +  install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
@@ -94,7 +94,7 @@ index 9b54cac..a610bcc 100644
 +  install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
 +  ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
 +  install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
-+  install -m 644 usockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
++  install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
  
  clean:
rm -f *.o
@@ -104,11 +104,11 @@ index 9b54cac..a610bcc 100644
 +  rm -f libusockets.pc
 +
 +.PHONY: default install clean
-diff --git a/usockets.pc.in b/usockets.pc.in
+diff --git a/libusockets.pc.in b/libusockets.pc.in
 new file mode 100644
 index 000..b818020
 --- /dev/null
-+++ b/usockets.pc.in
 b/libusockets.pc.in
 @@ -0,0 +1,12 @@
 +prefix=@PREFIX@
 +libdir=${prefix}/@LIB@

diff --git a/net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild 
b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
similarity index 100%
rename from net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild
rename to net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

2021-05-09 Thread Aisha Tammy

commit: 835fcaa403c4a2d86d4fac4a3b312d87b1049bfa
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun May  9 11:58:16 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sun May  9 12:09:34 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=835fcaa4

net-libs/usockets: rename pkgconfig file

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/files/usockets-0.7.1-Makefile.patch  | 10 +-
 ...7.1_p20210214.ebuild => usockets-0.7.1_p20210214-r1.ebuild} |  0
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch 
b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
index 4d3d2045e..f1ed03b5a 100644
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 9b54cac..c31e575 100644
+index 9b54cac..a610bcc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,60 +1,59 @@
@@ -86,7 +86,7 @@ index 9b54cac..c31e575 100644
 +  $(AR) rvs libusockets.a *.o
 +  $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) 
`$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
 +  sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+  -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > 
libusockets.pc
++  -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" usockets.pc.in > 
usockets.pc
 +
 +install:
 +  install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
@@ -94,7 +94,7 @@ index 9b54cac..c31e575 100644
 +  install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
 +  ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
 +  install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
-+  install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
++  install -m 644 usockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
  
  clean:
rm -f *.o
@@ -104,11 +104,11 @@ index 9b54cac..c31e575 100644
 +  rm -f libusockets.pc
 +
 +.PHONY: default install clean
-diff --git a/libusockets.pc.in b/libusockets.pc.in
+diff --git a/usockets.pc.in b/usockets.pc.in
 new file mode 100644
 index 000..b818020
 --- /dev/null
-+++ b/libusockets.pc.in
 b/usockets.pc.in
 @@ -0,0 +1,12 @@
 +prefix=@PREFIX@
 +libdir=${prefix}/@LIB@

diff --git a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild 
b/net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild
similarity index 100%
rename from net-libs/usockets/usockets-0.7.1_p20210214.ebuild
rename to net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-05-03 Thread Andrew Ammerlaan

commit: 7833a73834c5a4ffe060acd576bfdeeef2a9d5b8
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon May  3 09:51:34 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon May  3 09:51:34 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7833a738

net-libs/usockets: add MissingUseDepDefault

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  riseup.net>

 net-libs/usockets/usockets-0.7.1_p20210214.ebuild | 2 +-
 net-libs/usockets/usockets-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild 
b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
index e601304db..d7d107c8c 100644
--- a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 IUSE="libuv +ssl static-libs"
 
 DEPEND="
-   libuv? ( dev-libs/libuv[static-libs?] )
+   libuv? ( dev-libs/libuv[static-libs(-)?] )
ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
 "
 RDEPEND="${DEPEND}"

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 18e9a5255..e40b7ed25 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="libuv +ssl static-libs"
 
 DEPEND="
-   libuv? ( dev-libs/libuv[static-libs?] )
+   libuv? ( dev-libs/libuv[static-libs(-)?] )
ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-04-23 Thread Aisha Tammy

commit: 47a8d266c65e5cabb3007437ad550b98a126a4c0
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Apr 23 10:12:12 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Apr 23 10:12:23 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=47a8d266

net-libs/usockets: fix direct AR calls

Closes: https://bugs.gentoo.org/785190
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/usockets-0.7.1_p20210214.ebuild | 2 +-
 net-libs/usockets/usockets-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild 
b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
index 499d8f975..e601304db 100644
--- a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
@@ -33,7 +33,7 @@ PATCHES=(
 )
 
 src_configure() {
-   tc-export CC CXX
+   tc-export CC CXX AR
export VERSION="${PV%_*}" \
   LIB="$(get_libdir)" \
   WITH_OPENSSL="$(usex ssl 1 0)"

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 10ce0fdd3..18e9a5255 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_configure() {
-   tc-export CC CXX
+   tc-export CC CXX AR
export VERSION="${PV%_*}" \
   LIB="$(get_libdir)" \
   WITH_OPENSSL="$(usex ssl 1 0)"

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

2021-04-10 Thread Aisha Tammy

commit: c078876d094b5299a501b9cc05eadc9e284d6f64
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sat Apr 10 22:08:47 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sat Apr 10 22:08:47 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c078876d

net-libs/usockets: drop old version

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest |   1 -
 .../usockets/files/usockets-0.6.0-Makefile.patch   | 124 -
 net-libs/usockets/usockets-0.6.0_p20210126.ebuild  |  50 -
 3 files changed, 175 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 8ef09f26e..5637694ac 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 
3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab
 SHA512 
047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e97807dec9047e6497823a880ae7deed03
 DIST usockets-0.7.1.tar.gz 62337 BLAKE2B 
84f4274e560fae5bd12d22c87d0c44234421939ec978218b094848506448b622d32648d6f5163e95abf956f18bd6e26ffc58e27403572e49295572fd0f8eed32
 SHA512 
06e5ae094fd07b623d65dfcb3168cf6dcd115fc41c8af1858527be6bef08cbfa432a87021c32e7b3c87d56662a32a971b08b3b2934e91b822cf68407951015ed

diff --git a/net-libs/usockets/files/usockets-0.6.0-Makefile.patch 
b/net-libs/usockets/files/usockets-0.6.0-Makefile.patch
deleted file mode 100644
index 4994b29d9..0
--- a/net-libs/usockets/files/usockets-0.6.0-Makefile.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 27f97ce..f8bf8d7 100644
 a/Makefile
-+++ b/Makefile
-@@ -1,60 +1,59 @@
-+DESTDIR ?=
-+
-+prefix ?= /usr
-+exec_prefix ?=$(prefix)
-+LIB ?=lib
-+libdir ?= $(exec_prefix)/$(LIB)
-+includedir ?= $(exec_prefix)/include
-+
-+PKG_CONFIG ?= pkg-config
-+
-+VERSION ?=0.0
-+LIBTARGET =   libusockets.so.$(VERSION)
-+
-+REQUIRES =
-+COMMON_FLAGS =-Isrc
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
- # For now we need to link with C++ for OpenSSL support, but should be removed 
with time
- ifeq ($(WITH_OPENSSL),1)
--  override CFLAGS += -DLIBUS_USE_OPENSSL
--  # With problems on macOS, make sure to pass needed LDFLAGS required to 
find these
--  override LDFLAGS += -lssl -lcrypto -lstdc++
--else
--  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
OpenSSL)
--  ifeq ($(WITH_WOLFSSL),1)
--  # todo: change these
--  override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
--  override LDFLAGS += -L/usr/local/lib -lwolfssl
--  else
--  override CFLAGS += -DLIBUS_NO_SSL
--  endif
-+COMMON_FLAGS +=   -DLIBUS_USE_OPENSSL
-+LDFLAGS +=-lstdc++
-+REQUIRES +=   libssl libcrypto
- endif
- 
- # WITH_LIBUV=1 builds with libuv as event-loop
- ifeq ($(WITH_LIBUV),1)
--  override CFLAGS += -DLIBUS_USE_LIBUV
--  override LDFLAGS += -luv
-+COMMON_FLAGS +=   -DLIBUS_USE_LIBUV
-+REQUIRES +=   libuv
- endif
- 
--# WITH_GCD=1 builds with libdispatch as event-loop
--ifeq ($(WITH_GCD),1)
--  override CFLAGS += -DLIBUS_USE_GCD
--  override LDFLAGS += -framework CoreFoundation
--endif
-+CFLAGS += -std=c11 $(COMMON_FLAGS)
-+CXXFLAGS +=   -std=c++17 $(COMMON_FLAGS)
- 
--# WITH_ASAN builds with sanitizers
--ifeq ($(WITH_ASAN),1)
--  override CFLAGS += -fsanitize=address -g
--  override LDFLAGS += -lasan
--endif
--
--override CFLAGS += -std=c11 -Isrc
--override LDFLAGS += uSockets.a
--
--# By default we build the uSockets.a static library
- default:
--  rm -f *.o
--  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
--# For now we do rely on C++17 for OpenSSL support but we will be porting this 
work to C11
-+  $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
- ifeq ($(WITH_OPENSSL),1)
--  $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
-+  $(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
- endif
--  $(AR) rvs uSockets.a *.o
--
--# Builds all examples
--.PHONY: examples
--examples: default
--  for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename 
"$$f" ".c") "$$f" $(LDFLAGS); done
--
--swift_examples:
--  swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o 
swift_http_server
-+  $(AR) rvs libusockets.a *.o
-+  $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) 
`$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
-+  sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+  -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > 
libusockets.pc
-+
-+install:
-+  install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
-+  install -m 644

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-04-10 Thread Aisha Tammy

commit: b7b33e05327dc521fd4fc778a5e4436d8e2712e2
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sat Apr 10 22:11:17 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sat Apr 10 22:11:17 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b7b33e05

net-libs/usockets: drop old buggy version

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest  |  1 -
 net-libs/usockets/usockets-0.7.1.ebuild | 49 -
 2 files changed, 50 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index c3a151dd8..aef4019f1 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.7.1.tar.gz 62337 BLAKE2B 
84f4274e560fae5bd12d22c87d0c44234421939ec978218b094848506448b622d32648d6f5163e95abf956f18bd6e26ffc58e27403572e49295572fd0f8eed32
 SHA512 
06e5ae094fd07b623d65dfcb3168cf6dcd115fc41c8af1858527be6bef08cbfa432a87021c32e7b3c87d56662a32a971b08b3b2934e91b822cf68407951015ed
 DIST usockets-0.7.1_p20210214.tar.gz 62372 BLAKE2B 
2853792af6f86954d7920cd33936ddd586cdeb9149dbffd0687b3bbc0965526d28c363864398d17182df9e038c35dc384271f01e72f7a60189319b9e820de3cb
 SHA512 
d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11

diff --git a/net-libs/usockets/usockets-0.7.1.ebuild 
b/net-libs/usockets/usockets-0.7.1.ebuild
deleted file mode 100644
index 10ce0fdd3..0
--- a/net-libs/usockets/usockets-0.7.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="tiny eventing, networking & crypto for async applications"
-HOMEPAGE="https://github.com/uNetworking/uSockets";
-
-if [[ ${PV} ==  ]]; 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"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-   S="${WORKDIR}/uSockets-${PV}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="libuv +ssl static-libs"
-
-DEPEND="
-   libuv? ( dev-libs/libuv[static-libs?] )
-   ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.7.1-Makefile.patch"
-)
-
-src_configure() {
-   tc-export CC CXX
-   export VERSION="${PV%_*}" \
-  LIB="$(get_libdir)" \
-  WITH_OPENSSL="$(usex ssl 1 0)"
-  WITH_LIBUV="$(usex libuv 1 0)"
-   default
-}
-
-src_install() {
-   default
-   einstalldocs
-   if ! use static-libs; then
-   rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
-   fi
-}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-04-10 Thread Aisha Tammy

commit: fee68e109afccd2bc894b6394877408726827763
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sat Apr 10 22:10:55 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sat Apr 10 22:10:55 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fee68e10

net-libs/usockets: version bump to dated

fixes read-write order error

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest|  1 +
 net-libs/usockets/usockets-0.7.1_p20210214.ebuild | 50 +++
 2 files changed, 51 insertions(+)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 5637694ac..c3a151dd8 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.7.1.tar.gz 62337 BLAKE2B 
84f4274e560fae5bd12d22c87d0c44234421939ec978218b094848506448b622d32648d6f5163e95abf956f18bd6e26ffc58e27403572e49295572fd0f8eed32
 SHA512 
06e5ae094fd07b623d65dfcb3168cf6dcd115fc41c8af1858527be6bef08cbfa432a87021c32e7b3c87d56662a32a971b08b3b2934e91b822cf68407951015ed
+DIST usockets-0.7.1_p20210214.tar.gz 62372 BLAKE2B 
2853792af6f86954d7920cd33936ddd586cdeb9149dbffd0687b3bbc0965526d28c363864398d17182df9e038c35dc384271f01e72f7a60189319b9e820de3cb
 SHA512 
d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11

diff --git a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild 
b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
new file mode 100644
index 0..499d8f975
--- /dev/null
+++ b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="tiny eventing, networking & crypto for async applications"
+HOMEPAGE="https://github.com/uNetworking/uSockets";
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git";
+else
+   COMMIT=5440dbac79bd76444175b76ee95dfcade12a6aac
+   
SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/uSockets-${COMMIT}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="libuv +ssl static-libs"
+
+DEPEND="
+   libuv? ( dev-libs/libuv[static-libs?] )
+   ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.7.1-Makefile.patch"
+)
+
+src_configure() {
+   tc-export CC CXX
+   export VERSION="${PV%_*}" \
+  LIB="$(get_libdir)" \
+  WITH_OPENSSL="$(usex ssl 1 0)"
+  WITH_LIBUV="$(usex libuv 1 0)"
+   default
+}
+
+src_install() {
+   default
+   einstalldocs
+   if ! use static-libs; then
+   rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
+   fi
+}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

2021-02-14 Thread Aisha Tammy

commit: 5b03312f2fe5d1121be27f0f9fb8fe1fa0fcfbf3
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Feb 14 22:17:34 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sun Feb 14 22:19:55 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b03312f

net-libs/usockets: version bump to 0.7.1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest |   1 +
 .../usockets/files/usockets-0.7.1-Makefile.patch   | 124 +
 ...{usockets-.ebuild => usockets-0.7.1.ebuild} |   7 +-
 net-libs/usockets/usockets-.ebuild |   7 +-
 4 files changed, 131 insertions(+), 8 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index ffe05544..8ef09f26 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 
3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab
 SHA512 
047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e97807dec9047e6497823a880ae7deed03
+DIST usockets-0.7.1.tar.gz 62337 BLAKE2B 
84f4274e560fae5bd12d22c87d0c44234421939ec978218b094848506448b622d32648d6f5163e95abf956f18bd6e26ffc58e27403572e49295572fd0f8eed32
 SHA512 
06e5ae094fd07b623d65dfcb3168cf6dcd115fc41c8af1858527be6bef08cbfa432a87021c32e7b3c87d56662a32a971b08b3b2934e91b822cf68407951015ed

diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch 
b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
new file mode 100644
index ..4d3d2045
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -0,0 +1,124 @@
+diff --git a/Makefile b/Makefile
+index 9b54cac..c31e575 100644
+--- a/Makefile
 b/Makefile
+@@ -1,60 +1,59 @@
++DESTDIR ?=
++
++prefix ?= /usr
++exec_prefix ?=$(prefix)
++LIB ?=lib
++libdir ?= $(exec_prefix)/$(LIB)
++includedir ?= $(exec_prefix)/include
++
++PKG_CONFIG ?= pkg-config
++
++VERSION ?=0.0
++LIBTARGET =   libusockets.so.$(VERSION)
++
++REQUIRES =
++COMMON_FLAGS =-Isrc
++
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
+ # For now we need to link with C++ for OpenSSL support, but should be removed 
with time
+ ifeq ($(WITH_OPENSSL),1)
+-  override CFLAGS += -DLIBUS_USE_OPENSSL
+-  # With problems on macOS, make sure to pass needed LDFLAGS required to 
find these
+-  override LDFLAGS += -lssl -lcrypto -lstdc++
+-else
+-  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
OpenSSL)
+-  ifeq ($(WITH_WOLFSSL),1)
+-  # todo: change these
+-  override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
+-  override LDFLAGS += -L/usr/local/lib -lwolfssl
+-  else
+-  override CFLAGS += -DLIBUS_NO_SSL
+-  endif
++COMMON_FLAGS +=   -DLIBUS_USE_OPENSSL
++LDFLAGS +=-lssl -lcrypto -lstdc++
++REQUIRES +=   libssl libcrypto
+ endif
+ 
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+-  override CFLAGS += -DLIBUS_USE_LIBUV
+-  override LDFLAGS += -luv
++COMMON_FLAGS +=   -DLIBUS_USE_LIBUV
++REQUIRES +=   libuv
+ endif
+ 
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+-  override CFLAGS += -DLIBUS_USE_GCD
+-  override LDFLAGS += -framework CoreFoundation
+-endif
++CFLAGS += -std=c11 $(COMMON_FLAGS)
++CXXFLAGS +=   -std=c++17 $(COMMON_FLAGS)
+ 
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+-  override CFLAGS += -fsanitize=address -g
+-  override LDFLAGS += -fsanitize=address
+-endif
+-
+-override CFLAGS += -std=c11 -Isrc
+-override LDFLAGS += uSockets.a
+-
+-# By default we build the uSockets.a static library
+ default:
+-  rm -f *.o
+-  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
+-# For now we do rely on C++17 for OpenSSL support but we will be porting this 
work to C11
++  $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
+ ifeq ($(WITH_OPENSSL),1)
+-  $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
++  $(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
+ endif
+-  $(AR) rvs uSockets.a *.o
+-
+-# Builds all examples
+-.PHONY: examples
+-examples: default
+-  for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename 
"$$f" ".c") "$$f" $(LDFLAGS); done
+-
+-swift_examples:
+-  swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o 
swift_http_server
++  $(AR) rvs libusockets.a *.o
++  $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) 
`$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
++  sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
++  -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > 
libusockets.pc
++
++install:
++

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-01-29 Thread Aisha Tammy

commit: 52ff8234350a4fb01bd24a1b70c70b65f5946605
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Jan 29 11:01:10 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Jan 29 11:04:19 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=52ff8234

net-libs/usockets: drop old version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest|  1 -
 net-libs/usockets/usockets-0.6.0_p1-r2.ebuild | 50 ---
 2 files changed, 51 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 6789ca40..ffe05544 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.6.0_p1.tar.gz 57634 BLAKE2B 
67faa23add9c88dd49eed4849766e3aedd3993741ced9491d01b6d0caf56b032a9689827018714dbc87b500f3755db4edacb035573f7a563cd7147b1e187
 SHA512 
0dbedc5e90af9a92e6597e801116b57fd99dcd5a8488e3b5ddce83bbcd1852d30f2c8954dc1991a807d32f00bdb62e654498687fec344d295f299ccf3920a1ca
 DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 
3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab
 SHA512 
047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e97807dec9047e6497823a880ae7deed03

diff --git a/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild 
b/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild
deleted file mode 100644
index dc363d49..
--- a/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="tiny eventing, networking & crypto for async applications"
-HOMEPAGE="https://github.com/uNetworking/uSockets";
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git";
-else
-   COMMIT=7683672d87067cd75b854f4e36b9820f4809a4be
-   
SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-   S="${WORKDIR}/uSockets-${COMMIT}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="libuv +ssl static-libs"
-
-DEPEND="
-   libuv? ( dev-libs/libuv[static-libs?] )
-   ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.6.0-Makefile.patch"
-)
-
-src_configure() {
-   tc-export CC CXX
-   export VERSION="${PV%_*}" \
-  LIB="$(get_libdir)" \
-  WITH_OPENSSL="$(usex ssl 1 0)"
-  WITH_LIBUV="$(usex libuv 1 0)"
-   default
-}
-
-src_install() {
-   default
-   einstalldocs
-   if ! use static-libs; then
-   rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
-   fi
-}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-01-29 Thread Aisha Tammy

commit: afca75d856053f08e7af76760c56f3c537770b74
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Jan 29 11:00:53 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Jan 29 11:04:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=afca75d8

net-libs/usockets: version bump to new date

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest  | 1 +
 .../usockets/{usockets-.ebuild => usockets-0.6.0_p20210126.ebuild}  | 2 +-
 net-libs/usockets/usockets-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index f999ba4b..6789ca40 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.6.0_p1.tar.gz 57634 BLAKE2B 
67faa23add9c88dd49eed4849766e3aedd3993741ced9491d01b6d0caf56b032a9689827018714dbc87b500f3755db4edacb035573f7a563cd7147b1e187
 SHA512 
0dbedc5e90af9a92e6597e801116b57fd99dcd5a8488e3b5ddce83bbcd1852d30f2c8954dc1991a807d32f00bdb62e654498687fec344d295f299ccf3920a1ca
+DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 
3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab
 SHA512 
047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e97807dec9047e6497823a880ae7deed03

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-0.6.0_p20210126.ebuild
similarity index 95%
copy from net-libs/usockets/usockets-.ebuild
copy to net-libs/usockets/usockets-0.6.0_p20210126.ebuild
index dc363d49..37f78076 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-0.6.0_p20210126.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git";
 else
-   COMMIT=7683672d87067cd75b854f4e36b9820f4809a4be
+   COMMIT=45a70140b191e74c66301e5fefdacbd298b8c518

SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
S="${WORKDIR}/uSockets-${COMMIT}"

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index dc363d49..37f78076 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git";
 else
-   COMMIT=7683672d87067cd75b854f4e36b9820f4809a4be
+   COMMIT=45a70140b191e74c66301e5fefdacbd298b8c518

SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
S="${WORKDIR}/uSockets-${COMMIT}"

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-01-28 Thread Aisha Tammy

commit: bd01c5550e488ae57bb4480d0f618f3f9d2a6c39
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Jan 29 02:10:17 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Jan 29 02:20:21 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bd01c555

net-libs/usockets: fix library soname version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 ...6.0_p1-r1.ebuild => usockets-0.6.0_p1-r2.ebuild} | 21 -
 net-libs/usockets/usockets-.ebuild  | 21 -
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/net-libs/usockets/usockets-0.6.0_p1-r1.ebuild 
b/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild
similarity index 74%
rename from net-libs/usockets/usockets-0.6.0_p1-r1.ebuild
rename to net-libs/usockets/usockets-0.6.0_p1-r2.ebuild
index bdd890be..5962a653 100644
--- a/net-libs/usockets/usockets-0.6.0_p1-r1.ebuild
+++ b/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,22 +34,17 @@ PATCHES=(
"${FILESDIR}/${PN}-0.6.0-Makefile.patch"
 )
 
-src_compile() {
+src_configure() {
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
+   export VERSION="${PV%_*}" \
+  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
+   default
einstalldocs
if ! use static-libs; then
rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index bdd890be..5962a653 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,22 +34,17 @@ PATCHES=(
"${FILESDIR}/${PN}-0.6.0-Makefile.patch"
 )
 
-src_compile() {
+src_configure() {
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
+   export VERSION="${PV%_*}" \
+  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
+   default
einstalldocs
if ! use static-libs; then
rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2021-01-28 Thread Aisha Tammy

commit: 1d52636b4dd037d88b1825ee999cea6a68f64a40
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Jan 29 02:19:18 2021 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Jan 29 02:20:32 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1d52636b

net-libs/usockets: drop libressl

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/usockets-0.6.0_p1-r2.ebuild | 8 +++-
 net-libs/usockets/usockets-.ebuild| 8 +++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild 
b/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild
index 5962a653..dc363d49 100644
--- a/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild
+++ b/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild
@@ -20,13 +20,11 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="libuv libressl +ssl static-libs"
+IUSE="libuv +ssl static-libs"
 
-DEPEND="ssl? (
-   !libressl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
-   libressl? ( dev-libs/libressl[static-libs?] )
-   )
+DEPEND="
libuv? ( dev-libs/libuv[static-libs?] )
+   ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 5962a653..dc363d49 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -20,13 +20,11 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="libuv libressl +ssl static-libs"
+IUSE="libuv +ssl static-libs"
 
-DEPEND="ssl? (
-   !libressl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
-   libressl? ( dev-libs/libressl[static-libs?] )
-   )
+DEPEND="
libuv? ( dev-libs/libuv[static-libs?] )
+   ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2020-11-25 Thread Aisha Tammy

commit: 5dc0801d3a2aab77c8c4285404113a3ae5ad3275
Author: epsilonKNOT  aisha  cc>
AuthorDate: Wed Nov 25 23:53:18 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Wed Nov 25 23:53:18 2020 +
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-.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-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 1ebe7f13..bdd890be 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.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

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2020-11-23 Thread Aisha Tammy

commit: acc02dcb79219f1bcad38eef26e468636798c7f8
Author: epsilonKNOT  aisha  cc>
AuthorDate: Mon Nov 23 14:50:54 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Mon Nov 23 14:50:54 2020 +
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  aisha.cc>

 net-libs/usockets/Manifest| 2 +-
 .../{usockets-0.6.0-r1.ebuild => usockets-0.6.0_p1.ebuild}| 8 +---
 net-libs/usockets/usockets-.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 
67faa23add9c88dd49eed4849766e3aedd3993741ced9491d01b6d0caf56b032a9689827018714dbc87b500f3755db4edacb035573f7a563cd7147b1e187
 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} ==  ]]; 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-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 1d42acf6..1ebe7f13 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.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} ==  ]]; 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)" \

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

2020-11-22 Thread Aisha Tammy

commit: ae86e8c552c377835ac0d2bfd521e06e55432c7f
Author: Aisha Tammy  aisha  cc>
AuthorDate: Mon Nov 23 02:46:51 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Mon Nov 23 02:46:51 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae86e8c5

net-libs/usockets: add pkg-config file

really painful upstream makes life hell
libressl is considered a joke
shared libraries are considered a joke
not doing -O3 -flto is considered a joke
rehauled the whole Makefile to make it useable

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>

 .../usockets/files/usockets-0.6.0-Makefile.patch   | 128 +
 net-libs/usockets/files/usockets-Makefile.patch|  62 --
 net-libs/usockets/usockets-0.6.0-r1.ebuild |  20 ++--
 net-libs/usockets/usockets-.ebuild |  20 ++--
 4 files changed, 148 insertions(+), 82 deletions(-)

diff --git a/net-libs/usockets/files/usockets-0.6.0-Makefile.patch 
b/net-libs/usockets/files/usockets-0.6.0-Makefile.patch
new file mode 100644
index ..ebc9a0db
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.6.0-Makefile.patch
@@ -0,0 +1,128 @@
+diff --git a/Makefile b/Makefile
+index 27f97ce..c269c3f 100644
+--- a/Makefile
 b/Makefile
+@@ -1,60 +1,62 @@
++DESTDIR ?=
++
++prefix ?= /usr
++exec_prefix ?=$(prefix)
++LIB ?=lib
++libdir ?= $(exec_prefix)/$(LIB)
++includedir ?= $(exec_prefix)/include/uSockets
++
++VERSION ?=0.0
++LIBTARGET =   libusockets.so.$(VERSION)
++
++LIBS =
++REQUIRES =
++
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
+ # For now we need to link with C++ for OpenSSL support, but should be removed 
with time
+ ifeq ($(WITH_OPENSSL),1)
+-  override CFLAGS += -DLIBUS_USE_OPENSSL
+-  # With problems on macOS, make sure to pass needed LDFLAGS required to 
find these
+-  override LDFLAGS += -lssl -lcrypto -lstdc++
+-else
+-  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
OpenSSL)
+-  ifeq ($(WITH_WOLFSSL),1)
+-  # todo: change these
+-  override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
+-  override LDFLAGS += -L/usr/local/lib -lwolfssl
+-  else
+-  override CFLAGS += -DLIBUS_NO_SSL
+-  endif
++CFLAGS += -DLIBUS_USE_OPENSSL
++LIBS +=   -lssl -lcrypto -lstdc++
++REQUIRES +=   libssl libcrypto
+ endif
+ 
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+-  override CFLAGS += -DLIBUS_USE_LIBUV
+-  override LDFLAGS += -luv
+-endif
+-
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+-  override CFLAGS += -DLIBUS_USE_GCD
+-  override LDFLAGS += -framework CoreFoundation
++CFLAGS += -DLIBUS_USE_LIBUV
++LIBS +=   -luv
++REQUIRES +=   libuv
+ endif
+ 
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+-  override CFLAGS += -fsanitize=address -g
+-  override LDFLAGS += -lasan
+-endif
+-
+-override CFLAGS += -std=c11 -Isrc
+-override LDFLAGS += uSockets.a
++CFLAGS += -std=c11 -Isrc
+ 
+-# By default we build the uSockets.a static library
+ default:
+-  rm -f *.o
+-  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
+-# For now we do rely on C++17 for OpenSSL support but we will be porting this 
work to C11
++  $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
+ ifeq ($(WITH_OPENSSL),1)
+-  $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
++  $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -c src/crypto/*.cpp
+ endif
+-  $(AR) rvs uSockets.a *.o
+-
+-# Builds all examples
+-.PHONY: examples
+-examples: default
+-  for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename 
"$$f" ".c") "$$f" $(LDFLAGS); done
+-
+-swift_examples:
+-  swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o 
swift_http_server
++  $(AR) rvs libusockets.a *.o
++  $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) 
*.o $(LIBS) $(LDFLAGS)
++  sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
++  -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > 
libusockets.pc
++
++install:
++  install -d "$(DESTDIR)$(libdir)/pkgconfig" \
++  "$(DESTDIR)$(includedir)/internal/eventing" \
++  "$(DESTDIR)$(includedir)/internal/networking"
++  install -m 644 src/*.h "$(DESTDIR)$(includedir)/"
++  install -m 644 src/internal/*.h "$(DESTDIR)$(includedir)/internal/"
++  install -m 644 src/internal/eventing/*.h 
"$(DESTDIR)$(includedir)/internal/eventing/"
++  install -m 644 src/internal/networking/*.h 
"$(DESTDIR)$(includedir)/internal/networking/"
++  install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
++  ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
++  install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
++  install -m 644 lib

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

2020-11-22 Thread Aisha Tammy

commit: 753e8bf323bb15a1432a121ef768c6e071867616
Author: epsilonKNOT  aisha  cc>
AuthorDate: Sun Nov 22 23:33:44 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sun Nov 22 23:33:44 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=753e8bf3

net-libs/usockets: fix ssl build

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

 net-libs/usockets/files/usockets-Makefile.patch | 17 +
 .../{usockets-0.6.0.ebuild => usockets-0.6.0-r1.ebuild} |  2 +-
 net-libs/usockets/usockets-.ebuild  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/net-libs/usockets/files/usockets-Makefile.patch 
b/net-libs/usockets/files/usockets-Makefile.patch
index c641db0b..a3c50bc1 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 27f97ce..1a01539 100644
+index 27f97ce..066305c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,3 +1,13 @@
@@ -8,7 +8,7 @@ index 27f97ce..1a01539 100644
 +prefix ?=   "/usr/local"
 +exec_prefix ?=  "$(prefix)"
 +libdir ?=   "$(exec_prefix)/lib"
-+includedir?="$(exec_prefix)/include/uSockets"
++includedir ?=   "$(exec_prefix)/include/uSockets"
 +
 +# OpenBSD specific library version
 +LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
@@ -16,7 +16,7 @@ index 27f97ce..1a01539 100644
  # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
  # For now we need to link with C++ for OpenSSL support, but should be removed 
with time
  ifeq ($(WITH_OPENSSL),1)
-@@ -34,17 +44,28 @@ ifeq ($(WITH_ASAN),1)
+@@ -34,17 +44,31 @@ ifeq ($(WITH_ASAN),1)
  endif
  
  override CFLAGS += -std=c11 -Isrc
@@ -28,11 +28,12 @@ index 27f97ce..1a01539 100644
rm -f *.o
 -  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
 -# For now we do rely on C++17 for OpenSSL support but we will be porting this 
work to C11
--ifeq ($(WITH_OPENSSL),1)
++  $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
+ ifeq ($(WITH_OPENSSL),1)
 -  $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
--endif
++  $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -c src/crypto/*.cpp
+ endif
 -  $(AR) rvs uSockets.a *.o
-+  $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
 +  $(AR) rvs libusockets.a *.o
 +  $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) 
*.o $(LDFLAGS)
 +
@@ -41,8 +42,8 @@ index 27f97ce..1a01539 100644
 +  install -d "$(DESTDIR)$(libdir)" \
 +  "$(DESTDIR)$(includedir)/internal/eventing" \
 +  "$(DESTDIR)$(includedir)/internal/networking"
-+  # OpenBSD specific library version
 +  install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)/"
++  ln -sf $(LIBTARGET)"$(DESTDIR)$(libdir)/libusockets.so"
 +  # install static library
 +  install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
 +  # we also install all the header files
@@ -53,7 +54,7 @@ index 27f97ce..1a01539 100644
  
  # Builds all examples
  .PHONY: examples
-@@ -57,4 +78,5 @@ swift_examples:
+@@ -57,4 +81,5 @@ swift_examples:
  clean:
rm -f *.o
rm -f *.a

diff --git a/net-libs/usockets/usockets-0.6.0.ebuild 
b/net-libs/usockets/usockets-0.6.0-r1.ebuild
similarity index 98%
rename from net-libs/usockets/usockets-0.6.0.ebuild
rename to net-libs/usockets/usockets-0.6.0-r1.ebuild
index 07f68285..2da9a11a 100644
--- a/net-libs/usockets/usockets-0.6.0.ebuild
+++ b/net-libs/usockets/usockets-0.6.0-r1.ebuild
@@ -44,7 +44,7 @@ src_compile() {
 src_install() {
emake libdir="/usr/$(get_libdir)" \
  prefix="/usr" \
- DESTDIR="${D}" \
+ DESTDIR="${ED}" \
  LIBusockets_VERSION=${PV} \
  install
einstalldocs

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 07f68285..2da9a11a 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -44,7 +44,7 @@ src_compile() {
 src_install() {
emake libdir="/usr/$(get_libdir)" \
  prefix="/usr" \
- DESTDIR="${D}" \
+ DESTDIR="${ED}" \
  LIBusockets_VERSION=${PV} \
  install
einstalldocs

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

2020-09-08 Thread Aisha Tammy

commit: 1713cdefbadcab1daa9340c5fd13611d7e7454a9
Author: Aisha Tammy  aisha  cc>
AuthorDate: Tue Sep  8 20:33:25 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Tue Sep  8 20:33:25 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1713cdef

net-libs/usockets: version bump

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest  |  1 +
 net-libs/usockets/files/usockets-Makefile.patch | 24 ++-
 net-libs/usockets/usockets-0.6.0.ebuild | 54 +
 3 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 8d649f4a..af6d36e3 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.5.0.tar.gz 50852 BLAKE2B 
69d36f4bad6e2bf87a8b33a023678b29d2aa2feea86ccd92d02d38e9b336d9b97a0d9709b381d7b2b1a20c86964eaa9fec8d7edaa322288b232ce7c3ea84f056
 SHA512 
ac734c1e6f50b0485456d5b0f06d6aeb5457b2b3cc1fc2c795773a469e0bdf7223256ba252d1f9cbead10948ca47ce8bcdbabc147fc3e6be59d1a051409375bd
+DIST usockets-0.6.0.tar.gz 57590 BLAKE2B 
8438a3d2a1861d995410fcda8b888d561de2fb51af319e58c529f1113cb8e4d0f821b1649618c28d43dbc64f28b6b4e90f7e0bd51fcabc5afdc8318ca8f21448
 SHA512 
0803a117334d4dc38b4936e6f1d34984a9fba30da1c360c3ff3d7ce14275a4ac9c4a4e7b407791fc3661c50be6b6a8335d26f808b21d0ade5f85ab721b14a500

diff --git a/net-libs/usockets/files/usockets-Makefile.patch 
b/net-libs/usockets/files/usockets-Makefile.patch
index 5a105704..c641db0b 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,31 +1,36 @@
 diff --git a/Makefile b/Makefile
-index 7d33414..6f3e53a 100644
+index 27f97ce..1a01539 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,3 +1,13 @@
 +DESTDIR ?=
 +
-+prefix ?= "/usr/local"
-+exec_prefix ?="$(prefix)"
-+libdir ?= "$(exec_prefix)/lib"
-+includedir?=  "$(exec_prefix)/include/uSockets"
++prefix ?=   "/usr/local"
++exec_prefix ?=  "$(prefix)"
++libdir ?=   "$(exec_prefix)/lib"
++includedir?="$(exec_prefix)/include/uSockets"
 +
 +# OpenBSD specific library version
-+LIBTARGET =   libusockets.so.$(LIBusockets_VERSION)
++LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
 +
  # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
+ # For now we need to link with C++ for OpenSSL support, but should be removed 
with time
  ifeq ($(WITH_OPENSSL),1)
-   override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,13 +43,27 @@ ifeq ($(WITH_ASAN),1)
+@@ -34,17 +44,28 @@ ifeq ($(WITH_ASAN),1)
  endif
  
  override CFLAGS += -std=c11 -Isrc
 -override LDFLAGS += uSockets.a
  
 -# By default we build the uSockets.a static library
++
  default:
rm -f *.o
 -  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
+-# For now we do rely on C++17 for OpenSSL support but we will be porting this 
work to C11
+-ifeq ($(WITH_OPENSSL),1)
+-  $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
+-endif
 -  $(AR) rvs uSockets.a *.o
 +  $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
 +  $(AR) rvs libusockets.a *.o
@@ -48,10 +53,9 @@ index 7d33414..6f3e53a 100644
  
  # Builds all examples
  .PHONY: examples
-@@ -52,4 +76,6 @@ swift_examples:
+@@ -57,4 +78,5 @@ swift_examples:
  clean:
rm -f *.o
rm -f *.a
 +  rm -f *.so
rm -rf .certs
-+

diff --git a/net-libs/usockets/usockets-0.6.0.ebuild 
b/net-libs/usockets/usockets-0.6.0.ebuild
new file mode 100644
index ..07f68285
--- /dev/null
+++ b/net-libs/usockets/usockets-0.6.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="tiny eventing, networking & crypto for async applications"
+HOMEPAGE="https://github.com/uNetworking/uSockets";
+
+if [[ ${PV} ==  ]]; 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"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/uSockets-${PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="libuv +ssl libressl static-libs"
+
+DEPEND="ssl? (
+   libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
+   !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
+   )
+   libuv? ( dev-libs/libuv[static-libs?] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/usockets-Makefile.patch"
+)
+
+src_compile() {
+   # the Makefile uses environment variables
+   emake LIBusockets_VERSION=${PV} \
+ WITH_OPENSSL=$(usex ssl 1 0) \
+ WITH_LIBUV=$(usex libuv 1 0) \
+ default
+}
+
+src_install() {
+   emake libdir="/usr/$(get_libdir)" \
+ prefix="/usr" \
+

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2020-09-08 Thread Aisha Tammy

commit: 3995a95daf6e67eadd0720472ff9a6df0846d151
Author: Aisha Tammy  aisha  cc>
AuthorDate: Tue Sep  8 20:33:30 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Tue Sep  8 20:33:30 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3995a95d

net-libs/usockets: drop old version

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest  |  1 -
 net-libs/usockets/usockets-0.5.0.ebuild | 54 -
 2 files changed, 55 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index af6d36e3..3e7ce58a 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.5.0.tar.gz 50852 BLAKE2B 
69d36f4bad6e2bf87a8b33a023678b29d2aa2feea86ccd92d02d38e9b336d9b97a0d9709b381d7b2b1a20c86964eaa9fec8d7edaa322288b232ce7c3ea84f056
 SHA512 
ac734c1e6f50b0485456d5b0f06d6aeb5457b2b3cc1fc2c795773a469e0bdf7223256ba252d1f9cbead10948ca47ce8bcdbabc147fc3e6be59d1a051409375bd
 DIST usockets-0.6.0.tar.gz 57590 BLAKE2B 
8438a3d2a1861d995410fcda8b888d561de2fb51af319e58c529f1113cb8e4d0f821b1649618c28d43dbc64f28b6b4e90f7e0bd51fcabc5afdc8318ca8f21448
 SHA512 
0803a117334d4dc38b4936e6f1d34984a9fba30da1c360c3ff3d7ce14275a4ac9c4a4e7b407791fc3661c50be6b6a8335d26f808b21d0ade5f85ab721b14a500

diff --git a/net-libs/usockets/usockets-0.5.0.ebuild 
b/net-libs/usockets/usockets-0.5.0.ebuild
deleted file mode 100644
index 07f68285..
--- a/net-libs/usockets/usockets-0.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-DESCRIPTION="tiny eventing, networking & crypto for async applications"
-HOMEPAGE="https://github.com/uNetworking/uSockets";
-
-if [[ ${PV} ==  ]]; 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"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-   S="${WORKDIR}/uSockets-${PV}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="libuv +ssl libressl static-libs"
-
-DEPEND="ssl? (
-   libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
-   !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
-   )
-   libuv? ( dev-libs/libuv[static-libs?] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/usockets-Makefile.patch"
-)
-
-src_compile() {
-   # the Makefile uses environment variables
-   emake LIBusockets_VERSION=${PV} \
- WITH_OPENSSL=$(usex ssl 1 0) \
- WITH_LIBUV=$(usex libuv 1 0) \
- default
-}
-
-src_install() {
-   emake libdir="/usr/$(get_libdir)" \
- prefix="/usr" \
- DESTDIR="${D}" \
- LIBusockets_VERSION=${PV} \
- install
-   einstalldocs
-   if ! use static-libs; then
-   rm "${D}/usr/$(get_libdir)/libusockets.a" || die
-   fi
-}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

2020-07-29 Thread Aisha Tammy

commit: 76c4834856ed8b49748d7f2bcc844eb79d41b09e
Author: Aisha Tammy  aisha  cc>
AuthorDate: Wed Jul 29 12:37:17 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Wed Jul 29 12:44:25 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=76c48348

net-libs/usockets: update to 0.5.0

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest  |  1 +
 net-libs/usockets/files/usockets-Makefile.patch | 12 +++---
 net-libs/usockets/usockets-0.5.0.ebuild | 54 +
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 26023b0..57d722f 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.4.1.tar.gz 49955 BLAKE2B 
581b5745c4b1562fe21ac81736ebc6db95ed9e25a47e3124fa4dbc25978cde9f901a651cbc99128952282407f506900cae79a59bb1aab8d5e951e114d1f8f3b7
 SHA512 
2fbb37e0d3768c4b79b100132edd4aea65c7483186394d9dd5729385031e257ebe7ba04e53cb67f796edbc035074268920a1fdb11be79a74cb83799a7b61f7c0
+DIST usockets-0.5.0.tar.gz 50852 BLAKE2B 
69d36f4bad6e2bf87a8b33a023678b29d2aa2feea86ccd92d02d38e9b336d9b97a0d9709b381d7b2b1a20c86964eaa9fec8d7edaa322288b232ce7c3ea84f056
 SHA512 
ac734c1e6f50b0485456d5b0f06d6aeb5457b2b3cc1fc2c795773a469e0bdf7223256ba252d1f9cbead10948ca47ce8bcdbabc147fc3e6be59d1a051409375bd

diff --git a/net-libs/usockets/files/usockets-Makefile.patch 
b/net-libs/usockets/files/usockets-Makefile.patch
index 5be09ee..5a10570 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index fa6e2ff..ca2603f 100644
+index 7d33414..6f3e53a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,3 +1,14 @@
+@@ -1,3 +1,13 @@
 +DESTDIR ?=
 +
 +prefix ?= "/usr/local"
@@ -13,11 +13,10 @@ index fa6e2ff..ca2603f 100644
 +# OpenBSD specific library version
 +LIBTARGET =   libusockets.so.$(LIBusockets_VERSION)
 +
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
  ifeq ($(WITH_OPENSSL),1)
override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,13 +44,27 @@ ifeq ($(WITH_ASAN),1)
+@@ -33,13 +43,27 @@ ifeq ($(WITH_ASAN),1)
  endif
  
  override CFLAGS += -std=c11 -Isrc
@@ -49,9 +48,10 @@ index fa6e2ff..ca2603f 100644
  
  # Builds all examples
  .PHONY: examples
-@@ -52,4 +77,5 @@ swift_examples:
+@@ -52,4 +76,6 @@ swift_examples:
  clean:
rm -f *.o
rm -f *.a
 +  rm -f *.so
rm -rf .certs
++

diff --git a/net-libs/usockets/usockets-0.5.0.ebuild 
b/net-libs/usockets/usockets-0.5.0.ebuild
new file mode 100644
index 000..07f6828
--- /dev/null
+++ b/net-libs/usockets/usockets-0.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="tiny eventing, networking & crypto for async applications"
+HOMEPAGE="https://github.com/uNetworking/uSockets";
+
+if [[ ${PV} ==  ]]; 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"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/uSockets-${PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="libuv +ssl libressl static-libs"
+
+DEPEND="ssl? (
+   libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
+   !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
+   )
+   libuv? ( dev-libs/libuv[static-libs?] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/usockets-Makefile.patch"
+)
+
+src_compile() {
+   # the Makefile uses environment variables
+   emake LIBusockets_VERSION=${PV} \
+ WITH_OPENSSL=$(usex ssl 1 0) \
+ WITH_LIBUV=$(usex libuv 1 0) \
+ default
+}
+
+src_install() {
+   emake libdir="/usr/$(get_libdir)" \
+ prefix="/usr" \
+ DESTDIR="${D}" \
+ LIBusockets_VERSION=${PV} \
+ install
+   einstalldocs
+   if ! use static-libs; then
+   rm "${D}/usr/$(get_libdir)/libusockets.a" || die
+   fi
+}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2020-07-29 Thread Aisha Tammy

commit: 727a54919ec5a99a9e5907b734c5b0817861c188
Author: Aisha Tammy  aisha  cc>
AuthorDate: Wed Jul 29 12:37:56 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Wed Jul 29 12:44:33 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=727a5491

net-libs/usockets: drop old version

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest |  1 -
 net-libs/usockets/usockets-0.4.1-r1.ebuild | 54 --
 2 files changed, 55 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 57d722f..8d649f4 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.4.1.tar.gz 49955 BLAKE2B 
581b5745c4b1562fe21ac81736ebc6db95ed9e25a47e3124fa4dbc25978cde9f901a651cbc99128952282407f506900cae79a59bb1aab8d5e951e114d1f8f3b7
 SHA512 
2fbb37e0d3768c4b79b100132edd4aea65c7483186394d9dd5729385031e257ebe7ba04e53cb67f796edbc035074268920a1fdb11be79a74cb83799a7b61f7c0
 DIST usockets-0.5.0.tar.gz 50852 BLAKE2B 
69d36f4bad6e2bf87a8b33a023678b29d2aa2feea86ccd92d02d38e9b336d9b97a0d9709b381d7b2b1a20c86964eaa9fec8d7edaa322288b232ce7c3ea84f056
 SHA512 
ac734c1e6f50b0485456d5b0f06d6aeb5457b2b3cc1fc2c795773a469e0bdf7223256ba252d1f9cbead10948ca47ce8bcdbabc147fc3e6be59d1a051409375bd

diff --git a/net-libs/usockets/usockets-0.4.1-r1.ebuild 
b/net-libs/usockets/usockets-0.4.1-r1.ebuild
deleted file mode 100644
index 07f6828..000
--- a/net-libs/usockets/usockets-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-DESCRIPTION="tiny eventing, networking & crypto for async applications"
-HOMEPAGE="https://github.com/uNetworking/uSockets";
-
-if [[ ${PV} ==  ]]; 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"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-   S="${WORKDIR}/uSockets-${PV}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="libuv +ssl libressl static-libs"
-
-DEPEND="ssl? (
-   libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
-   !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
-   )
-   libuv? ( dev-libs/libuv[static-libs?] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/usockets-Makefile.patch"
-)
-
-src_compile() {
-   # the Makefile uses environment variables
-   emake LIBusockets_VERSION=${PV} \
- WITH_OPENSSL=$(usex ssl 1 0) \
- WITH_LIBUV=$(usex libuv 1 0) \
- default
-}
-
-src_install() {
-   emake libdir="/usr/$(get_libdir)" \
- prefix="/usr" \
- DESTDIR="${D}" \
- LIBusockets_VERSION=${PV} \
- install
-   einstalldocs
-   if ! use static-libs; then
-   rm "${D}/usr/$(get_libdir)/libusockets.a" || die
-   fi
-}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2020-06-26 Thread Aisha Tammy

commit: 05670022596dc81d67e4ad26e3604d2e201eb6e4
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Jun 26 10:32:32 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Jun 26 10:32:32 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=05670022

net-libs/usockets: remove proxy-maint from metadata

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/net-libs/usockets/metadata.xml b/net-libs/usockets/metadata.xml
index a24f33a..4e34222 100644
--- a/net-libs/usockets/metadata.xml
+++ b/net-libs/usockets/metadata.xml
@@ -5,10 +5,6 @@
gen...@aisha.cc
Aisha Tammy

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

Enable bindings to use the libuv 
dispatcher

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

2020-06-26 Thread Aisha Tammy

commit: 288701ce317e0530f533163121dd67fcd8396635
Author: Aisha Tammy  aisha  cc>
AuthorDate: Fri Jun 26 10:19:48 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Fri Jun 26 10:20:09 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=288701ce

net-libs/usockets: removed unneeded BDEPEND

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/files/usockets-Makefile.patch  | 17 +
 net-libs/usockets/metadata.xml   | 18 +++---
 ...sockets-0.4.1.ebuild => usockets-0.4.1-r1.ebuild} | 20 +---
 net-libs/usockets/usockets-.ebuild   | 20 +---
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/net-libs/usockets/files/usockets-Makefile.patch 
b/net-libs/usockets/files/usockets-Makefile.patch
index a51f8b1..5be09ee 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index fa6e2ff..529ed74 100644
+index fa6e2ff..ca2603f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,3 +1,14 @@
@@ -17,28 +17,21 @@ index fa6e2ff..529ed74 100644
  # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
  ifeq ($(WITH_OPENSSL),1)
override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,13 +44,33 @@ ifeq ($(WITH_ASAN),1)
+@@ -33,13 +44,27 @@ ifeq ($(WITH_ASAN),1)
  endif
  
  override CFLAGS += -std=c11 -Isrc
 -override LDFLAGS += uSockets.a
  
 -# By default we build the uSockets.a static library
--default:
-+static:
+ default:
rm -f *.o
 -  $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
 -  $(AR) rvs uSockets.a *.o
-+  $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
-+  $(AR) rvs libusockets.a *.o
-+
-+dynamic:
-+  rm -f *.o
 +  $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
++  $(AR) rvs libusockets.a *.o
 +  $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) 
*.o $(LDFLAGS)
 +
-+default: static dynamic
-+
 +install:
 +  # install the folders needed  (making sure that the exist)
 +  install -d "$(DESTDIR)$(libdir)" \
@@ -56,7 +49,7 @@ index fa6e2ff..529ed74 100644
  
  # Builds all examples
  .PHONY: examples
-@@ -52,4 +83,5 @@ swift_examples:
+@@ -52,4 +77,5 @@ swift_examples:
  clean:
rm -f *.o
rm -f *.a

diff --git a/net-libs/usockets/metadata.xml b/net-libs/usockets/metadata.xml
index 73dd576..a24f33a 100644
--- a/net-libs/usockets/metadata.xml
+++ b/net-libs/usockets/metadata.xml
@@ -1,11 +1,15 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-gen...@aisha.cc
-Aisha Tammy
-
-
-  Enable bindings to use the libuv dispatcher
-
+   
+   gen...@aisha.cc
+   Aisha Tammy
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   Enable bindings to use the libuv 
dispatcher
+   
 

diff --git a/net-libs/usockets/usockets-0.4.1.ebuild 
b/net-libs/usockets/usockets-0.4.1-r1.ebuild
similarity index 78%
rename from net-libs/usockets/usockets-0.4.1.ebuild
rename to net-libs/usockets/usockets-0.4.1-r1.ebuild
index 0b4a1f0..07f6828 100644
--- a/net-libs/usockets/usockets-0.4.1.ebuild
+++ b/net-libs/usockets/usockets-0.4.1-r1.ebuild
@@ -27,7 +27,6 @@ DEPEND="ssl? (
)
libuv? ( dev-libs/libuv[static-libs?] )
 "
-BDEPEND="${DEPEND}"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -36,19 +35,18 @@ PATCHES=(
 
 src_compile() {
# the Makefile uses environment variables
-   emake -j1 \
- LIBusockets_VERSION=${PV} \
- WITH_OPENSSL=$(usex ssl 1 0) \
- WITH_LIBUV=$(usex libuv 1 0) \
- default
+   emake LIBusockets_VERSION=${PV} \
+ WITH_OPENSSL=$(usex ssl 1 0) \
+ WITH_LIBUV=$(usex libuv 1 0) \
+ default
 }
 
 src_install() {
-   emake -j1 \
- libdir="/usr/$(get_libdir)" \
- prefix="/usr" DESTDIR="${D}" \
- LIBusockets_VERSION=${PV} \
- install
+   emake libdir="/usr/$(get_libdir)" \
+ prefix="/usr" \
+ DESTDIR="${D}" \
+ LIBusockets_VERSION=${PV} \
+ install
einstalldocs
if ! use static-libs; then
rm "${D}/usr/$(get_libdir)/libusockets.a" || die

diff --git a/net-libs/usockets/usockets-.ebuild 
b/net-libs/usockets/usockets-.ebuild
index 0b4a1f0..07f6828 100644
--- a/net-libs/usockets/usockets-.ebuild
+++ b/net-libs/usockets/usockets-.ebuild
@@ -27,7 +27,6 @@ DEPEND="ssl? (
)
libuv? ( dev-libs/libuv[static-libs?] )
 "
-BDEPEND="${DEPEND}"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -36,19 +35,18 @@ PATCHES=(
 
 src_compile() {
# the Makefile uses environment variables
-   emak

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2020-06-23 Thread Aisha Tammy

commit: 4353834b2e43d781a5ee13d4b5b78179abab7a6e
Author: Aisha Tammy  aisha  cc>
AuthorDate: Wed Jun 24 02:15:51 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Wed Jun 24 02:15:51 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4353834b

net-libs/usockets: drop old broken version 0.4.0

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest  |  1 -
 net-libs/usockets/usockets-0.4.0.ebuild | 56 -
 2 files changed, 57 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 29f39fa..26023b0 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.4.0.tar.gz 48367 BLAKE2B 
025b83bd1f9778c469ad29bde0f8cab7fbc5f9b86e5cd97261b9aee77c2d26a67d22a185a17011e9c067acb23e0341c4112a00dbf270510013e1e863b5678ff1
 SHA512 
c480c6fd4a87ebe7d9db1928185075d52da63482f4ecc37f684fe10654e92de540badf47d2ab8e6021266a87308496189b39e95830d11924da0023a222decf2d
 DIST usockets-0.4.1.tar.gz 49955 BLAKE2B 
581b5745c4b1562fe21ac81736ebc6db95ed9e25a47e3124fa4dbc25978cde9f901a651cbc99128952282407f506900cae79a59bb1aab8d5e951e114d1f8f3b7
 SHA512 
2fbb37e0d3768c4b79b100132edd4aea65c7483186394d9dd5729385031e257ebe7ba04e53cb67f796edbc035074268920a1fdb11be79a74cb83799a7b61f7c0

diff --git a/net-libs/usockets/usockets-0.4.0.ebuild 
b/net-libs/usockets/usockets-0.4.0.ebuild
deleted file mode 100644
index 0b4a1f0..000
--- a/net-libs/usockets/usockets-0.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-DESCRIPTION="tiny eventing, networking & crypto for async applications"
-HOMEPAGE="https://github.com/uNetworking/uSockets";
-
-if [[ ${PV} ==  ]]; 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"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-   S="${WORKDIR}/uSockets-${PV}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="libuv +ssl libressl static-libs"
-
-DEPEND="ssl? (
-   libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
-   !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
-   )
-   libuv? ( dev-libs/libuv[static-libs?] )
-"
-BDEPEND="${DEPEND}"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/usockets-Makefile.patch"
-)
-
-src_compile() {
-   # the Makefile uses environment variables
-   emake -j1 \
- LIBusockets_VERSION=${PV} \
- WITH_OPENSSL=$(usex ssl 1 0) \
- WITH_LIBUV=$(usex libuv 1 0) \
- default
-}
-
-src_install() {
-   emake -j1 \
- libdir="/usr/$(get_libdir)" \
- prefix="/usr" DESTDIR="${D}" \
- LIBusockets_VERSION=${PV} \
- install
-   einstalldocs
-   if ! use static-libs; then
-   rm "${D}/usr/$(get_libdir)/libusockets.a" || die
-   fi
-}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

2020-06-23 Thread Aisha Tammy

commit: 3001daa50fb79a450631a1bf00f773f422df658f
Author: Aisha Tammy  aisha  cc>
AuthorDate: Wed Jun 24 02:15:18 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Wed Jun 24 02:15:18 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3001daa5

net-libs/usockets: version bump to 0.4.1

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Aisha Tammy  aisha.cc>

 net-libs/usockets/Manifest  |  1 +
 net-libs/usockets/usockets-0.4.1.ebuild | 56 +
 2 files changed, 57 insertions(+)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 773a4ab..29f39fa 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.4.0.tar.gz 48367 BLAKE2B 
025b83bd1f9778c469ad29bde0f8cab7fbc5f9b86e5cd97261b9aee77c2d26a67d22a185a17011e9c067acb23e0341c4112a00dbf270510013e1e863b5678ff1
 SHA512 
c480c6fd4a87ebe7d9db1928185075d52da63482f4ecc37f684fe10654e92de540badf47d2ab8e6021266a87308496189b39e95830d11924da0023a222decf2d
+DIST usockets-0.4.1.tar.gz 49955 BLAKE2B 
581b5745c4b1562fe21ac81736ebc6db95ed9e25a47e3124fa4dbc25978cde9f901a651cbc99128952282407f506900cae79a59bb1aab8d5e951e114d1f8f3b7
 SHA512 
2fbb37e0d3768c4b79b100132edd4aea65c7483186394d9dd5729385031e257ebe7ba04e53cb67f796edbc035074268920a1fdb11be79a74cb83799a7b61f7c0

diff --git a/net-libs/usockets/usockets-0.4.1.ebuild 
b/net-libs/usockets/usockets-0.4.1.ebuild
new file mode 100644
index 000..0b4a1f0
--- /dev/null
+++ b/net-libs/usockets/usockets-0.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="tiny eventing, networking & crypto for async applications"
+HOMEPAGE="https://github.com/uNetworking/uSockets";
+
+if [[ ${PV} ==  ]]; 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"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/uSockets-${PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="libuv +ssl libressl static-libs"
+
+DEPEND="ssl? (
+   libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
+   !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
+   )
+   libuv? ( dev-libs/libuv[static-libs?] )
+"
+BDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/usockets-Makefile.patch"
+)
+
+src_compile() {
+   # the Makefile uses environment variables
+   emake -j1 \
+ LIBusockets_VERSION=${PV} \
+ WITH_OPENSSL=$(usex ssl 1 0) \
+ WITH_LIBUV=$(usex libuv 1 0) \
+ default
+}
+
+src_install() {
+   emake -j1 \
+ libdir="/usr/$(get_libdir)" \
+ prefix="/usr" DESTDIR="${D}" \
+ LIBusockets_VERSION=${PV} \
+ install
+   einstalldocs
+   if ! use static-libs; then
+   rm "${D}/usr/$(get_libdir)/libusockets.a" || die
+   fi
+}

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/, net-libs/usockets/files/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

[gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/

33 matches

Site Navigation

Mail list logo

Footer information