public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2020-06-25  7:29 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2020-06-25  7:29 UTC (permalink / raw
  To: gentoo-commits

commit:     4353834b2e43d781a5ee13d4b5b78179abab7a6e
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Jun 24 02:15:51 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jun 24 02:15:51 2020 +0000
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 <gentoo <AT> 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..0000000
--- 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} == 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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2020-06-25  7:29 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2020-06-25  7:29 UTC (permalink / raw
  To: gentoo-commits

commit:     3001daa50fb79a450631a1bf00f773f422df658f
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Jun 24 02:15:18 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jun 24 02:15:18 2020 +0000
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 <gentoo <AT> 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 0000000..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} == 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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2020-06-26 14:46 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2020-06-26 14:46 UTC (permalink / raw
  To: gentoo-commits

commit:     05670022596dc81d67e4ad26e3604d2e201eb6e4
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Jun 26 10:32:32 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jun 26 10:32:32 2020 +0000
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 <gentoo <AT> 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 @@
 		<email>gentoo@aisha.cc</email>
 		<name>Aisha Tammy</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2020-07-30 16:16 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2020-07-30 16:16 UTC (permalink / raw
  To: gentoo-commits

commit:     727a54919ec5a99a9e5907b734c5b0817861c188
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Jul 29 12:37:56 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jul 29 12:44:33 2020 +0000
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 <gentoo <AT> 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..0000000
--- 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} == 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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2020-09-11 16:51 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2020-09-11 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     3995a95daf6e67eadd0720472ff9a6df0846d151
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep  8 20:33:30 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Sep  8 20:33:30 2020 +0000
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 <gentoo <AT> 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..00000000
--- 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} == 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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2020-11-23 22:06 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2020-11-23 22:06 UTC (permalink / raw
  To: gentoo-commits

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

net-libs/usockets: fix cstdlib include error

also fix direct CC and CXX calls

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

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

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

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

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


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2020-11-26 12:10 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2020-11-26 12:10 UTC (permalink / raw
  To: gentoo-commits

commit:     5dc0801d3a2aab77c8c4285404113a3ae5ad3275
Author:     epsilonKNOT <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Nov 25 23:53:18 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Nov 25 23:53:18 2020 +0000
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 <gentoo <AT> aisha.cc>

 ...-0.6.0_p1.ebuild => usockets-0.6.0_p1-r1.ebuild} | 21 +++++++++++----------
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 1ebe7f13..bdd890be 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2021-01-29 11:10 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2021-01-29 11:10 UTC (permalink / raw
  To: gentoo-commits

commit:     bd01c5550e488ae57bb4480d0f618f3f9d2a6c39
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Jan 29 02:10:17 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 29 02:20:21 2021 +0000
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 <gentoo <AT> aisha.cc>

 ...6.0_p1-r1.ebuild => usockets-0.6.0_p1-r2.ebuild} | 21 ++++++++-------------
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index bdd890be..5962a653 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2021-01-29 11:10 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2021-01-29 11:10 UTC (permalink / raw
  To: gentoo-commits

commit:     1d52636b4dd037d88b1825ee999cea6a68f64a40
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Jan 29 02:19:18 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 29 02:20:32 2021 +0000
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 <gentoo <AT> aisha.cc>

 net-libs/usockets/usockets-0.6.0_p1-r2.ebuild | 8 +++-----
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 5962a653..dc363d49 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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}"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2021-01-29 11:10 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2021-01-29 11:10 UTC (permalink / raw
  To: gentoo-commits

commit:     52ff8234350a4fb01bd24a1b70c70b65f5946605
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Jan 29 11:01:10 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 29 11:04:19 2021 +0000
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 <gentoo <AT> 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 67faa23add9c88dd49eed4849766e3eeeeaedd3993741ced9491d01b6d0caf56b032a9689827018714dbc87b500f3755db4edacb035573f7a563cd7147b1e187 SHA512 0dbedc5e90af9a92e6597e801116b57fd99dcd5a8488e3b5ddce83bbcd1852d30f2c8954dc1991a807d32f00bdb62e654498687fec344d295f299ccf3920a1ca
 DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab SHA512 047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e978555507dec9047e6497823a880ae7deed03

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..00000000
--- 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} == 9999 ]]; 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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2021-01-29 11:10 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2021-01-29 11:10 UTC (permalink / raw
  To: gentoo-commits

commit:     afca75d856053f08e7af76760c56f3c537770b74
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Jan 29 11:00:53 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 29 11:04:07 2021 +0000
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 <gentoo <AT> aisha.cc>

 net-libs/usockets/Manifest                                              | 1 +
 .../usockets/{usockets-9999.ebuild => usockets-0.6.0_p20210126.ebuild}  | 2 +-
 net-libs/usockets/usockets-9999.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 67faa23add9c88dd49eed4849766e3eeeeaedd3993741ced9491d01b6d0caf56b032a9689827018714dbc87b500f3755db4edacb035573f7a563cd7147b1e187 SHA512 0dbedc5e90af9a92e6597e801116b57fd99dcd5a8488e3b5ddce83bbcd1852d30f2c8954dc1991a807d32f00bdb62e654498687fec344d295f299ccf3920a1ca
+DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab SHA512 047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e978555507dec9047e6497823a880ae7deed03

diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-0.6.0_p20210126.ebuild
similarity index 95%
copy from net-libs/usockets/usockets-9999.ebuild
copy to net-libs/usockets/usockets-0.6.0_p20210126.ebuild
index dc363d49..37f78076 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-0.6.0_p20210126.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; 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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index dc363d49..37f78076 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; 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}"


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2021-04-23 12:25 Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2021-04-23 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     47a8d266c65e5cabb3007437ad550b98a126a4c0
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Apr 23 10:12:12 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Apr 23 10:12:23 2021 +0000
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 <gentoo <AT> aisha.cc>

 net-libs/usockets/usockets-0.7.1_p20210214.ebuild | 2 +-
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 10ce0fdd3..18e9a5255 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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)"


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/
@ 2021-05-03  9:52 Andrew Ammerlaan
  2021-05-03 10:11 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
  0 siblings, 1 reply; 20+ messages in thread
From: Andrew Ammerlaan @ 2021-05-03  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7833a73834c5a4ffe060acd576bfdeeef2a9d5b8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon May  3 09:51:34 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon May  3 09:51:34 2021 +0000
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 <andrewammerlaan <AT> riseup.net>

 net-libs/usockets/usockets-0.7.1_p20210214.ebuild | 2 +-
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 18e9a5255..e40b7ed25 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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}"


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
  2021-05-03  9:52 [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/ Andrew Ammerlaan
@ 2021-05-03 10:11 ` Andrew Ammerlaan
  0 siblings, 0 replies; 20+ messages in thread
From: Andrew Ammerlaan @ 2021-05-03 10:11 UTC (permalink / raw
  To: gentoo-commits

commit:     7833a73834c5a4ffe060acd576bfdeeef2a9d5b8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon May  3 09:51:34 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon May  3 09:51:34 2021 +0000
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 <andrewammerlaan <AT> riseup.net>

 net-libs/usockets/usockets-0.7.1_p20210214.ebuild | 2 +-
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 18e9a5255..e40b7ed25 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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}"


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
  2021-06-09  3:22 [gentoo-commits] repo/proj/guru:dev " Theo Anderson
@ 2021-06-09  3:39 ` Theo Anderson
  0 siblings, 0 replies; 20+ messages in thread
From: Theo Anderson @ 2021-06-09  3:39 UTC (permalink / raw
  To: gentoo-commits

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

net-libs/usockets: drop static-libs

Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild | 10 ++++------
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index e40b7ed25..c08a9ad93 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
  2021-09-21  9:52 [gentoo-commits] repo/proj/guru:dev " Arthur Zamarin
@ 2021-09-21 10:02 ` Arthur Zamarin
  0 siblings, 0 replies; 20+ messages in thread
From: Arthur Zamarin @ 2021-09-21 10:02 UTC (permalink / raw
  To: gentoo-commits

commit:     3c0454efa84f198151cf03736b1fad38dff894c6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 21 09:46:48 2021 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 09:46:48 2021 +0000
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 <arthurzam <AT> gentoo.org>

 net-libs/usockets/usockets-0.7.1_p20210909.ebuild | 2 +-
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 3de0636c4..5c5a33ead 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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 )
 "


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2024-05-02 15:42 David Roman
  0 siblings, 0 replies; 20+ messages in thread
From: David Roman @ 2024-05-02 15:42 UTC (permalink / raw
  To: gentoo-commits

commit:     e720d4940d1b0d4adca22d3e5f5f4d5acccb59ee
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Apr 30 23:55:13 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Apr 30 23:55:16 2024 +0000
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 <gentoo <AT> 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..0000000000
--- 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} == 9999 ]]; 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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2024-05-02 15:42 David Roman
  0 siblings, 0 replies; 20+ messages in thread
From: David Roman @ 2024-05-02 15:42 UTC (permalink / raw
  To: gentoo-commits

commit:     f3fb1ff6617a726290fd637bd4dc930cce1706c6
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Wed May  1 01:44:42 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed May  1 01:44:42 2024 +0000
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 <davidroman96 <AT> gmail.com>

 net-libs/usockets/usockets-0.8.8.ebuild | 2 +-
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 07a9276ef2..16f5febb9c 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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 )
 "


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2024-05-16 17:59 Julien Roy
  0 siblings, 0 replies; 20+ messages in thread
From: Julien Roy @ 2024-05-16 17:59 UTC (permalink / raw
  To: gentoo-commits

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

net-libs/usockets: fix dependency on asio

Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 net-libs/usockets/usockets-0.8.8.ebuild | 2 +-
 net-libs/usockets/usockets-9999.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-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 16f5febb9c..328d32ea95 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.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 )
 "


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/
@ 2024-11-14 16:17 David Roman
  0 siblings, 0 replies; 20+ messages in thread
From: David Roman @ 2024-11-14 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     97f47c39bfa2f995da9557c696ce80a5df88aef1
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Wed Nov 13 22:53:29 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Nov 13 22:56:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=97f47c39

net-libs/usockets: update EAPI 7 -> 8

Also:
- avoid downloading submodules for live (boringssl is quite bulky)
- fix test

Closes: https://bugs.gentoo.org/820296
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>

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

diff --git a/net-libs/usockets/usockets-0.8.8.ebuild b/net-libs/usockets/usockets-0.8.8.ebuild
index 328d32ea9..93f82656b 100644
--- a/net-libs/usockets/usockets-0.8.8.ebuild
+++ b/net-libs/usockets/usockets-0.8.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/uNetworking/uSockets"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
+	EGIT_SUBMODULES=( '-*' ) # We don't use any of bundled libraries from submodules
 else
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -19,9 +20,10 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="asio libuv +ssl test"
-REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
-RESTRICT="!test? ( test )"
+IUSE="asio libuv +ssl"
+REQUIRED_USE="?? ( asio libuv )"
+# Our only half-assed test requires ssl
+RESTRICT="!ssl? ( test )"
 
 DEPEND="
 	asio? ( dev-cpp/asio:= )
@@ -40,13 +42,25 @@ PATCHES=(
 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)"
+		LIB="$(get_libdir)" \
+		WITH_OPENSSL="$(usex ssl 1 0)" \
+		WITH_LIBUV="$(usex libuv 1 0)" \
+		WITH_ASIO="$(usex asio 1 0)"
 	default
 }
 
+src_test() {
+	local saved_ulimit=$(ulimit -n)
+	# see https://bugs.gentoo.org/820296
+	if ! ulimit -n 10240; then
+		ewarn "Failed to set ulimit; ${PN} require ulimit -n 10240 to reliably pass tests"
+		ulimit -n 2048 || die "${PN} requires ulimit -n set to at least 2048 for tests"
+	fi
+
+	emake test
+	ulimit -n "${saved_ulimit}" || die "Failed restore ulimit to its original value"
+}
+
 src_install() {
 	default
 	einstalldocs

diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 328d32ea9..93f82656b 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/uNetworking/uSockets"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
+	EGIT_SUBMODULES=( '-*' ) # We don't use any of bundled libraries from submodules
 else
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -19,9 +20,10 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="asio libuv +ssl test"
-REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
-RESTRICT="!test? ( test )"
+IUSE="asio libuv +ssl"
+REQUIRED_USE="?? ( asio libuv )"
+# Our only half-assed test requires ssl
+RESTRICT="!ssl? ( test )"
 
 DEPEND="
 	asio? ( dev-cpp/asio:= )
@@ -40,13 +42,25 @@ PATCHES=(
 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)"
+		LIB="$(get_libdir)" \
+		WITH_OPENSSL="$(usex ssl 1 0)" \
+		WITH_LIBUV="$(usex libuv 1 0)" \
+		WITH_ASIO="$(usex asio 1 0)"
 	default
 }
 
+src_test() {
+	local saved_ulimit=$(ulimit -n)
+	# see https://bugs.gentoo.org/820296
+	if ! ulimit -n 10240; then
+		ewarn "Failed to set ulimit; ${PN} require ulimit -n 10240 to reliably pass tests"
+		ulimit -n 2048 || die "${PN} requires ulimit -n set to at least 2048 for tests"
+	fi
+
+	emake test
+	ulimit -n "${saved_ulimit}" || die "Failed restore ulimit to its original value"
+}
+
 src_install() {
 	default
 	einstalldocs


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2024-11-14 16:17 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-03  9:52 [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/ Andrew Ammerlaan
2021-05-03 10:11 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2024-11-14 16:17 David Roman
2024-05-16 17:59 Julien Roy
2024-05-02 15:42 David Roman
2024-05-02 15:42 David Roman
2021-09-21  9:52 [gentoo-commits] repo/proj/guru:dev " Arthur Zamarin
2021-09-21 10:02 ` [gentoo-commits] repo/proj/guru:master " Arthur Zamarin
2021-06-09  3:22 [gentoo-commits] repo/proj/guru:dev " Theo Anderson
2021-06-09  3:39 ` [gentoo-commits] repo/proj/guru:master " Theo Anderson
2021-04-23 12:25 Andrew Ammerlaan
2021-01-29 11:10 Andrew Ammerlaan
2021-01-29 11:10 Andrew Ammerlaan
2021-01-29 11:10 Andrew Ammerlaan
2021-01-29 11:10 Andrew Ammerlaan
2020-11-26 12:10 Andrew Ammerlaan
2020-11-23 22:06 Andrew Ammerlaan
2020-09-11 16:51 Andrew Ammerlaan
2020-07-30 16:16 Andrew Ammerlaan
2020-06-26 14:46 Andrew Ammerlaan
2020-06-25  7:29 Andrew Ammerlaan
2020-06-25  7:29 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox