commit: 23815a296438a9a87459b086bafcfed6d66e696d Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Thu Sep 9 16:13:12 2021 +0000 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> CommitDate: Thu Sep 9 16:13:12 2021 +0000 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 <gentoo <AT> 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..000000000 --- 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)$(includedir)" -+ install -m 644 src/libusockets.h "$(DESTDIR)$(includedir)/" -+ 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/" - - clean: - rm -f *.o - rm -f *.a -+ rm -f *.so - rm -rf .certs -+ rm -f libusockets.pc -+ -+.PHONY: default install clean -diff --git a/libusockets.pc.in b/libusockets.pc.in -new file mode 100644 -index 0000000..b818020 ---- /dev/null -+++ b/libusockets.pc.in -@@ -0,0 +1,12 @@ -+prefix=@PREFIX@ -+libdir=${prefix}/@LIB@ -+includedir=${prefix}/include -+ -+Name: uSockets -+Version: @VERSION@ -+Description: eventing, networking and crypto for async applications. -+URL: https://github.com/uNetworking/uSockets -+ -+Cflags: -I${includedir} -+Libs: -L${libdir} -lusockets -+Requires.private: @REQUIRES@ diff --git a/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild deleted file mode 100644 index 0e1f15d5b..000000000 --- a/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild +++ /dev/null @@ -1,48 +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} == 9999 ]]; 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" - -DEPEND=" - libuv? ( dev-libs/libuv ) - ssl? ( >=dev-libs/openssl-1.1.0 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.7.1-Makefile.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)" - default -} - -src_install() { - default - einstalldocs - rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die -}