[gentoo-commits] repo/gentoo:master commit in: dev-util/astyle/

[Matthias Maier]

commit:     2c81a00c035017c8943747cd9b2372e0a7c3229a
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 22:11:54 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon May 28 22:17:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c81a00c

dev-util/astyle: minor cleanup

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/astyle/astyle-3.0.1-r1.ebuild | 21 ++++++++++-----------
 dev-util/astyle/astyle-3.1-r2.ebuild   | 21 ++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild 
b/dev-util/astyle/astyle-3.0.1-r1.ebuild
index cdc9411aa46..24d96553a97 100644
--- a/dev-util/astyle/astyle-3.0.1-r1.ebuild
+++ b/dev-util/astyle/astyle-3.0.1-r1.ebuild
@@ -52,18 +52,17 @@ src_install() {
        pushd src/bin >/dev/null || die
        dobin ${PN}
 
-       # ex: libastyle.so.3.0.1
-       local libastylename=lib${PN}.so.${PV}
-       dolib.so ${libastylename}
-       # ex: libastyle.so.3
-       local libdestdir=/usr/$(get_libdir)
-       dosym ${libastylename} ${libdestdir}/lib${PN}.so.$(get_major_version)
-       dosym ${libastylename} ${libdestdir}/lib${PN}.so
+       local libastylename="lib${PN}.so.${PV}"
+       local libastylejname="lib${PN}j.so.${PV}"
+       local libdestdir="${EPREFIX}/usr/$(get_libdir)"
+
+       dolib.so "${libastylename}"
+       dosym "${libastylename}" 
"${libdestdir}/lib${PN}.so.$(get_major_version)"
+       dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
        if use java ; then
-               local libastylejname=lib${PN}j.so.${PV}
-               dolib.so ${libastylejname}
-               dosym ${libastylejname} 
${libdestdir}/lib${PN}j.so.$(get_major_version)
-               dosym ${libastylejname} ${libdestdir}/lib${PN}j.so
+               dolib.so "${libastylejname}"
+               dosym "${libastylejname}" 
"${libdestdir}/lib${PN}j.so.$(get_major_version)"
+               dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
        fi
        if use static-libs ; then
                dolib.a lib${PN}.a

diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild 
b/dev-util/astyle/astyle-3.1-r2.ebuild
index 5982affd7b5..ed480708102 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -52,18 +52,17 @@ src_install() {
        pushd src/bin >/dev/null || die
        dobin ${PN}
 
-       # ex: libastyle.so.3.0.1
-       local libastylename=lib${PN}.so.${PV}.0
-       dolib.so ${libastylename}
-       # ex: libastyle.so.3
-       local libdestdir=/usr/$(get_libdir)
-       dosym ${libastylename} ${libdestdir}/lib${PN}.so.$(get_major_version)
-       dosym ${libastylename} ${libdestdir}/lib${PN}.so
+       local libastylename="lib${PN}.so.${PV}"
+       local libastylejname="lib${PN}j.so.${PV}"
+       local libdestdir="${EPREFIX}/usr/$(get_libdir)"
+
+       dolib.so "${libastylename}"
+       dosym "${libastylename}" 
"${libdestdir}/lib${PN}.so.$(get_major_version)"
+       dosym "${libastylename}" "${libdestdir}/lib${PN}.so"
        if use java ; then
-               local libastylejname=lib${PN}j.so.${PV}.0
-               dolib.so ${libastylejname}
-               dosym ${libastylejname} 
${libdestdir}/lib${PN}j.so.$(get_major_version)
-               dosym ${libastylejname} ${libdestdir}/lib${PN}j.so
+               dolib.so "${libastylejname}"
+               dosym "${libastylejname}" 
"${libdestdir}/lib${PN}j.so.$(get_major_version)"
+               dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so"
        fi
        if use static-libs ; then
                dolib.a lib${PN}.a