| 1 |
commit: bd01c5550e488ae57bb4480d0f618f3f9d2a6c39 |
| 2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
| 3 |
AuthorDate: Fri Jan 29 02:10:17 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Fri Jan 29 02:20:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bd01c555 |
| 7 |
|
| 8 |
net-libs/usockets: fix library soname version |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
| 12 |
|
| 13 |
...6.0_p1-r1.ebuild => usockets-0.6.0_p1-r2.ebuild} | 21 ++++++++------------- |
| 14 |
net-libs/usockets/usockets-9999.ebuild | 21 ++++++++------------- |
| 15 |
2 files changed, 16 insertions(+), 26 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/usockets/usockets-0.6.0_p1-r1.ebuild b/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild |
| 18 |
similarity index 74% |
| 19 |
rename from net-libs/usockets/usockets-0.6.0_p1-r1.ebuild |
| 20 |
rename to net-libs/usockets/usockets-0.6.0_p1-r2.ebuild |
| 21 |
index bdd890be..5962a653 100644 |
| 22 |
--- a/net-libs/usockets/usockets-0.6.0_p1-r1.ebuild |
| 23 |
+++ b/net-libs/usockets/usockets-0.6.0_p1-r2.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 2019-2020 Gentoo Authors |
| 26 |
+# Copyright 2019-2021 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
@@ -34,22 +34,17 @@ PATCHES=( |
| 31 |
"${FILESDIR}/${PN}-0.6.0-Makefile.patch" |
| 32 |
) |
| 33 |
|
| 34 |
-src_compile() { |
| 35 |
+src_configure() { |
| 36 |
tc-export CC CXX |
| 37 |
- # the Makefile uses environment variables |
| 38 |
- emake VERSION=${PV} \ |
| 39 |
- LIB="$(get_libdir)" \ |
| 40 |
- WITH_OPENSSL=$(usex ssl 1 0) \ |
| 41 |
- WITH_LIBUV=$(usex libuv 1 0) \ |
| 42 |
- default |
| 43 |
+ export VERSION="${PV%_*}" \ |
| 44 |
+ LIB="$(get_libdir)" \ |
| 45 |
+ WITH_OPENSSL="$(usex ssl 1 0)" |
| 46 |
+ WITH_LIBUV="$(usex libuv 1 0)" |
| 47 |
+ default |
| 48 |
} |
| 49 |
|
| 50 |
src_install() { |
| 51 |
- emake LIB="$(get_libdir)" \ |
| 52 |
- prefix="${EPREFIX%/}/usr" \ |
| 53 |
- DESTDIR="${D}" \ |
| 54 |
- VERSION=${PV} \ |
| 55 |
- install |
| 56 |
+ default |
| 57 |
einstalldocs |
| 58 |
if ! use static-libs; then |
| 59 |
rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die |
| 60 |
|
| 61 |
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild |
| 62 |
index bdd890be..5962a653 100644 |
| 63 |
--- a/net-libs/usockets/usockets-9999.ebuild |
| 64 |
+++ b/net-libs/usockets/usockets-9999.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 2019-2020 Gentoo Authors |
| 67 |
+# Copyright 2019-2021 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=7 |
| 71 |
@@ -34,22 +34,17 @@ PATCHES=( |
| 72 |
"${FILESDIR}/${PN}-0.6.0-Makefile.patch" |
| 73 |
) |
| 74 |
|
| 75 |
-src_compile() { |
| 76 |
+src_configure() { |
| 77 |
tc-export CC CXX |
| 78 |
- # the Makefile uses environment variables |
| 79 |
- emake VERSION=${PV} \ |
| 80 |
- LIB="$(get_libdir)" \ |
| 81 |
- WITH_OPENSSL=$(usex ssl 1 0) \ |
| 82 |
- WITH_LIBUV=$(usex libuv 1 0) \ |
| 83 |
- default |
| 84 |
+ export VERSION="${PV%_*}" \ |
| 85 |
+ LIB="$(get_libdir)" \ |
| 86 |
+ WITH_OPENSSL="$(usex ssl 1 0)" |
| 87 |
+ WITH_LIBUV="$(usex libuv 1 0)" |
| 88 |
+ default |
| 89 |
} |
| 90 |
|
| 91 |
src_install() { |
| 92 |
- emake LIB="$(get_libdir)" \ |
| 93 |
- prefix="${EPREFIX%/}/usr" \ |
| 94 |
- DESTDIR="${D}" \ |
| 95 |
- VERSION=${PV} \ |
| 96 |
- install |
| 97 |
+ default |
| 98 |
einstalldocs |
| 99 |
if ! use static-libs; then |
| 100 |
rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die |
Archives