Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/
Date: Wed, 29 Dec 2021 01:58:52
Message-Id: 1640743116.74d0eed48ddfec80763e02da6d15521476e8e6f9.sam@gentoo
1 commit: 74d0eed48ddfec80763e02da6d15521476e8e6f9
2 Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
3 AuthorDate: Mon Dec 27 12:10:56 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 01:58:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d0eed4
7
8 dev-lang/mujs: cleaned up src_install
9
10 We improved the readability of the section in src_install
11 in which the mujs shared library is renamed and symlinked.
12
13 Package-Manager: Portage-3.0.30, Repoman-3.0.3
14 Signed-off-by: Philipp Roesner <rndxelement <AT> protonmail.com>
15 Closes: https://github.com/gentoo/gentoo/pull/23458
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 dev-lang/mujs/mujs-1.2.0.ebuild | 13 +++----------
19 1 file changed, 3 insertions(+), 10 deletions(-)
20
21 diff --git a/dev-lang/mujs/mujs-1.2.0.ebuild b/dev-lang/mujs/mujs-1.2.0.ebuild
22 index e25bff9dec49..3198466f0ae5 100644
23 --- a/dev-lang/mujs/mujs-1.2.0.ebuild
24 +++ b/dev-lang/mujs/mujs-1.2.0.ebuild
25 @@ -55,14 +55,7 @@ src_install() {
26 prefix=/usr \
27 install-shared
28
29 - # TODO: Tidy up this logic, improve readability
30 - if [[ ${CHOST} == *-darwin* ]] ; then
31 - mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so "${ED}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib || die
32 - dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.dylib
33 - dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.${PV:0:1}.dylib
34 - else
35 - mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
36 - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
37 - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
38 - fi
39 + 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"
40 + dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname)
41 + dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname ${PV:0:1})
42 }