commit: bd01c5550e488ae57bb4480d0f618f3f9d2a6c39 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Fri Jan 29 02:10:17 2021 +0000 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> 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