From 288701ce317e0530f533163121dd67fcd8396635 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 26 Jun 2020 06:19:48 -0400 Subject: net-libs/usockets: removed unneeded BDEPEND Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Aisha Tammy --- net-libs/usockets/files/usockets-Makefile.patch | 17 +++----- net-libs/usockets/metadata.xml | 18 ++++---- net-libs/usockets/usockets-0.4.1-r1.ebuild | 54 ++++++++++++++++++++++++ net-libs/usockets/usockets-0.4.1.ebuild | 56 ------------------------- net-libs/usockets/usockets-9999.ebuild | 20 ++++----- 5 files changed, 79 insertions(+), 86 deletions(-) create mode 100644 net-libs/usockets/usockets-0.4.1-r1.ebuild delete mode 100644 net-libs/usockets/usockets-0.4.1.ebuild diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch index a51f8b16b..5be09eeee 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 73dd5769c..a24f33aee 100644 --- a/net-libs/usockets/metadata.xml +++ b/net-libs/usockets/metadata.xml @@ -1,11 +1,15 @@ - - gentoo@aisha.cc - Aisha Tammy - - - Enable bindings to use the libuv dispatcher - + + gentoo@aisha.cc + Aisha Tammy + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Enable bindings to use the libuv dispatcher + diff --git a/net-libs/usockets/usockets-0.4.1-r1.ebuild b/net-libs/usockets/usockets-0.4.1-r1.ebuild new file mode 100644 index 000000000..07f682856 --- /dev/null +++ b/net-libs/usockets/usockets-0.4.1-r1.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} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git" +else + SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz" + 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 +} diff --git a/net-libs/usockets/usockets-0.4.1.ebuild b/net-libs/usockets/usockets-0.4.1.ebuild deleted file mode 100644 index 0b4a1f0a5..000000000 --- a/net-libs/usockets/usockets-0.4.1.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} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git" -else - SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz" - 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 -} diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild index 0b4a1f0a5..07f682856 100644 --- a/net-libs/usockets/usockets-9999.ebuild +++ b/net-libs/usockets/usockets-9999.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 -- cgit v1.2.3-65-gdbad