dev-util/astyle: minor cleanup

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild
index cdc9411aa4606892d8ec0532121b860f8e048b91..24d96553a978350198ab768ca20203ab3bfa9e42 100644 (file)
--- 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 5982affd7b5913cf95842111fc9ea2c51b820805..ed480708102fdc1ec30e2458aa3bc93e71d28046 100644 (file)
--- 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