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

[Aisha Tammy]

commit:     288701ce317e0530f533163121dd67fcd8396635
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Jun 26 10:19:48 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Fri Jun 26 10:20:09 2020 +0000
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 <gentoo <AT> 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-9999.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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>gentoo@×××××.cc</email>
-        <name>Aisha Tammy</name>
-    </maintainer>
-    <use>
-      <flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
-    </use>
+	<maintainer type="person">
+		<email>gentoo@×××××.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
+	</use>
 </pkgmetadata>

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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 0b4a1f0..07f6828 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