From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 48624158086 for ; Wed, 29 Dec 2021 01:58:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4CC92BC05F; Wed, 29 Dec 2021 01:58:50 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBF4E2BC05F for ; Wed, 29 Dec 2021 01:58:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AD2C342E3A for ; Wed, 29 Dec 2021 01:58:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D41926D for ; Wed, 29 Dec 2021 01:58:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1640743116.74d0eed48ddfec80763e02da6d15521476e8e6f9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/mujs/mujs-1.2.0.ebuild X-VCS-Directories: dev-lang/mujs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 74d0eed48ddfec80763e02da6d15521476e8e6f9 X-VCS-Branch: master Date: Wed, 29 Dec 2021 01:58:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b04c9779-a8a6-479c-ab91-61f1eef4dded X-Archives-Hash: f484ed6c51904970aa28f49b7a3d2dab commit: 74d0eed48ddfec80763e02da6d15521476e8e6f9 Author: Philipp Rösner protonmail com> AuthorDate: Mon Dec 27 12:10:56 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 29 01:58:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d0eed4 dev-lang/mujs: cleaned up src_install We improved the readability of the section in src_install in which the mujs shared library is renamed and symlinked. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Philipp Roesner protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/23458 Signed-off-by: Sam James gentoo.org> dev-lang/mujs/mujs-1.2.0.ebuild | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dev-lang/mujs/mujs-1.2.0.ebuild b/dev-lang/mujs/mujs-1.2.0.ebuild index e25bff9dec49..3198466f0ae5 100644 --- a/dev-lang/mujs/mujs-1.2.0.ebuild +++ b/dev-lang/mujs/mujs-1.2.0.ebuild @@ -55,14 +55,7 @@ src_install() { prefix=/usr \ install-shared - # TODO: Tidy up this logic, improve readability - if [[ ${CHOST} == *-darwin* ]] ; then - mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so "${ED}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib || die - dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.dylib - dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.${PV:0:1}.dylib - else - mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1} - fi + mv -v "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname) "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname ${PV}) || die "Failed adding version suffix to mujs shared library" + dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname) + dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname ${PV:0:1}) }